Skip to content

Commit

Permalink
fix: localhost not being resolved. Resolves argoproj#4460, argoproj#3564
Browse files Browse the repository at this point in the history
 (argoproj#4461)

Signed-off-by: Mike Chau <[email protected]>
  • Loading branch information
mikechau authored Nov 5, 2020
1 parent 59843e1 commit 42d0605
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ RUN ./recurl.sh /usr/local/bin/jq https://github.com/stedolan/jq/releases/downlo
RUN rm recurl.sh

COPY hack/ssh_known_hosts /etc/ssh/ssh_known_hosts
COPY hack/nsswitch.conf /etc/nsswitch.conf
COPY --from=builder /usr/local/bin/docker /usr/local/bin/

####################################################################################################
Expand Down Expand Up @@ -136,6 +137,7 @@ ENTRYPOINT [ "workflow-controller" ]
FROM scratch as argocli
USER 8737
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
COPY --from=argo-build /go/src/github.com/argoproj/argo/argo-server.crt argo-server.crt
COPY --from=argo-build /go/src/github.com/argoproj/argo/argo-server.key argo-server.key
Expand Down
1 change: 1 addition & 0 deletions hack/nsswitch.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hosts: files dns

0 comments on commit 42d0605

Please sign in to comment.