From 91e62bfc3b98b12cd7d0baba6c082edbf82fdc34 Mon Sep 17 00:00:00 2001 From: John Pitman Date: Thu, 1 Oct 2020 16:56:32 -0400 Subject: [PATCH] fix: fix broken docker build of argocd-test-tools image (#4471) Signed-off-by: John Pitman --- test/container/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/container/Dockerfile b/test/container/Dockerfile index 70c6702f17..4805400cc2 100644 --- a/test/container/Dockerfile +++ b/test/container/Dockerfile @@ -66,7 +66,7 @@ COPY --from=redis /usr/local/bin/* /usr/local/bin/ # Copy node binaries COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules COPY --from=node /usr/local/bin/node /usr/local/bin -COPY --from=node /opt/yarn-v1.15.2 /opt/yarn-v1.15.2 +COPY --from=node /opt/yarn-v1.22.4 /opt/yarn-v1.22.4 # Entrypoint is required for container's user management COPY ./test/container/uid_entrypoint.sh /usr/local/bin @@ -95,7 +95,7 @@ RUN useradd -l -u ${UID} -d /home/user -s /bin/bash user && \ ln -s /usr/local/bin/node /usr/local/bin/nodejs && \ ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \ ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx && \ - ln -s /opt/yarn-v1.15.2/bin/yarn /usr/local/bin/yarn && \ - ln -s /opt/yarn-v1.15.2/bin/yarnpkg /usr/local/bin/yarnpkg + ln -s /opt/yarn-v1.22.4/bin/yarn /usr/local/bin/yarn && \ + ln -s /opt/yarn-v1.22.4/bin/yarnpkg /usr/local/bin/yarnpkg ENTRYPOINT ["/usr/local/bin/uid_entrypoint.sh"]