From 3241fd4ae28c6c595a5fd9d2f58c9e131487ccca Mon Sep 17 00:00:00 2001
From: "m.nabokikh" <maksim.nabokikh@flant.com>
Date: Fri, 29 Jan 2021 13:46:47 +0400
Subject: [PATCH] Move downloading gomplate to separate stage
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
---
Dockerfile | 20 ++++++++++++--------
docker-entrypoint.sh | 1 -
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index edc2b9d5..c4db8435 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,14 +20,7 @@ COPY . .
RUN make release-binary
-FROM alpine:3.13.1
-
-# Dex connectors, such as GitHub and Google logins require root certificates.
-# Proper installations should manage those certificates, but it's a bad user
-# experience when this doesn't work out of the box.
-#
-# OpenSSL is required so wget can query HTTPS endpoints for health checking.
-RUN apk add --no-cache --update ca-certificates openssl
+FROM alpine:3.13.1 AS gomplate
ARG TARGETOS
ARG TARGETARCH
@@ -38,6 +31,16 @@ RUN wget -O /usr/local/bin/gomplate \
"https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_${TARGETOS:-linux}-${TARGETARCH:-amd64}${TARGETVARIANT}" \
&& chmod +x /usr/local/bin/gomplate
+
+FROM alpine:3.13.1
+
+# Dex connectors, such as GitHub and Google logins require root certificates.
+# Proper installations should manage those certificates, but it's a bad user
+# experience when this doesn't work out of the box.
+#
+# OpenSSL is required so wget can query HTTPS endpoints for health checking.
+RUN apk add --no-cache --update ca-certificates openssl
+
RUN mkdir -p /var/dex
RUN chown -R 1001:1001 /var/dex
@@ -50,6 +53,7 @@ COPY --from=builder /usr/local/src/dex/go.mod /usr/local/src/dex/go.sum /usr/loc
COPY --from=builder /usr/local/src/dex/api/v2/go.mod /usr/local/src/dex/api/v2/go.sum /usr/local/src/dex/api/v2/
COPY --from=builder /go/bin/dex /usr/local/bin/dex
+COPY --from=gomplate /usr/local/bin/gomplate /usr/local/bin/gomplate
USER 1001:1001
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 59bb34c6..739af9a3 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -9,7 +9,6 @@ case "$command" in
if test -f "$file_candidate"; then
tmpfile=$(mktemp /tmp/dex.config.yaml-XXXXXX)
gomplate -f "$file_candidate" -o "$tmpfile"
- echo "config rendered successfully into the tmp file ${tmpfile}"
args="${args} ${tmpfile}"
else
--
GitLab