From d38f848d0184129a8cb8c2ae2fee75ffc3aa1fe0 Mon Sep 17 00:00:00 2001 From: Christian Theilemann Date: Sun, 28 Jul 2019 04:24:31 -0700 Subject: [PATCH] set SSL_CERT_DIR to get gcr docker-credential-helper working --- Dockerfile | 2 ++ Dockerfile.alpine | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 66637e76..80f1d7a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,5 +15,7 @@ RUN make lbins FROM scratch COPY --from=builder /workspace/github.com/uber/makisu/bin/makisu/makisu.linux /makisu-internal/makisu ADD ./assets/cacerts.pem /makisu-internal/certs/cacerts.pem +# Required for embedded GCR docker-credential-helper to work correctly +ENV SSL_CERT_DIR /makisu-internal/certs ENTRYPOINT ["/makisu-internal/makisu"] diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 234446c3..23489547 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -17,5 +17,7 @@ RUN apk add --no-cache libc6-compat COPY --from=builder /workspace/github.com/uber/makisu/bin/makisu/makisu /makisu-internal/makisu ADD ./assets/cacerts.pem /makisu-internal/certs/cacerts.pem +# Required for embedded GCR docker-credential-helper to work correctly +ENV SSL_CERT_DIR /makisu-internal/certs ENTRYPOINT ["/makisu-internal/makisu"]