Skip to content

Commit

Permalink
fix: Missing arg lines caused files not to copy into containers (argo…
Browse files Browse the repository at this point in the history
…proj#4542)

Signed-off-by: David Gibbons <david.gibbons@vevo.com>
Signed-off-by: Alex Capras <alexcapras@gmail.com>
  • Loading branch information
davidgibbons authored and alexcapras committed Dec 2, 2020
1 parent 4d94e07 commit 25bc7fa
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ RUN . hack/image_arch.sh && ./dist/argo-${IMAGE_OS}-${IMAGE_ARCH} version 2>&1 |
# argoexec
####################################################################################################
FROM argoexec-base as argoexec
ARG IMAGE_OS=linux
COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/argoexec-${IMAGE_OS}-* /usr/local/bin/argoexec
ENTRYPOINT [ "argoexec" ]

Expand All @@ -126,6 +127,7 @@ ENTRYPOINT [ "argoexec" ]
####################################################################################################
FROM scratch as workflow-controller
USER 8737
ARG IMAGE_OS=linux
# Add timezone data
COPY --from=argo-build /usr/share/zoneinfo /usr/share/zoneinfo
COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/workflow-controller-${IMAGE_OS}-* /bin/workflow-controller
Expand All @@ -136,6 +138,7 @@ ENTRYPOINT [ "workflow-controller" ]
####################################################################################################
FROM scratch as argocli
USER 8737
ARG IMAGE_OS=linux
COPY --from=argoexec-base /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts
COPY --from=argoexec-base /etc/nsswitch.conf /etc/nsswitch.conf
COPY --from=argoexec-base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
Expand Down

0 comments on commit 25bc7fa

Please sign in to comment.