From 409a5154726dd16475b3aaf97f05f191cdb65808 Mon Sep 17 00:00:00 2001 From: Alex Collins Date: Mon, 3 Feb 2020 15:37:00 -0800 Subject: [PATCH] fix: Add certs to argocli image. Fixes #2129 (#2143) --- Dockerfile | 3 ++- Dockerfile.dev | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ad7b6b6c7ab..0022eebcb008 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,6 +94,7 @@ ENTRYPOINT [ "workflow-controller" ] # argocli #################################################################################################### FROM scratch as argocli +COPY --from=argoexec-base /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts +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/dist/argo-linux-amd64 /bin/argo ENTRYPOINT [ "argo" ] - diff --git a/Dockerfile.dev b/Dockerfile.dev index 4ad0db309ad8..b53f06c8221d 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -35,11 +35,14 @@ RUN wget https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-lin FROM debian:9.6-slim as argoexec-base # NOTE: keep the version synced with https://storage.googleapis.com/kubernetes-release/release/stable.txt ENV KUBECTL_VERSION=1.15.1 +ENV JQ_VERSION=1.6 RUN apt-get update && \ - apt-get install -y curl jq procps git tar mime-support && \ + apt-get install -y curl procps git tar mime-support && \ rm -rf /var/lib/apt/lists/* && \ curl -L -o /usr/local/bin/kubectl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \ - chmod +x /usr/local/bin/kubectl + chmod +x /usr/local/bin/kubectl && \ + curl -L -o /usr/local/bin/jq -LO https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \ + chmod +x /usr/local/bin/jq COPY hack/ssh_known_hosts /etc/ssh/ssh_known_hosts COPY --from=builder /usr/local/bin/docker /usr/local/bin/ @@ -63,5 +66,7 @@ ENTRYPOINT [ "workflow-controller" ] # argocli #################################################################################################### FROM scratch as argocli +COPY --from=argoexec-base /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts +COPY --from=argoexec-base /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY argo /bin/ ENTRYPOINT [ "argo" ]