Move downloading gomplate to separate stage
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
This commit is contained in:
parent
a6cb627763
commit
3241fd4ae2
2 changed files with 12 additions and 9 deletions
20
Dockerfile
20
Dockerfile
|
@ -20,14 +20,7 @@ COPY . .
|
||||||
|
|
||||||
RUN make release-binary
|
RUN make release-binary
|
||||||
|
|
||||||
FROM alpine:3.13.1
|
FROM alpine:3.13.1 AS gomplate
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
ARG TARGETOS
|
ARG TARGETOS
|
||||||
ARG TARGETARCH
|
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}" \
|
"https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_${TARGETOS:-linux}-${TARGETARCH:-amd64}${TARGETVARIANT}" \
|
||||||
&& chmod +x /usr/local/bin/gomplate
|
&& 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 mkdir -p /var/dex
|
||||||
RUN chown -R 1001:1001 /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 /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=builder /go/bin/dex /usr/local/bin/dex
|
||||||
|
COPY --from=gomplate /usr/local/bin/gomplate /usr/local/bin/gomplate
|
||||||
|
|
||||||
USER 1001:1001
|
USER 1001:1001
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@ case "$command" in
|
||||||
if test -f "$file_candidate"; then
|
if test -f "$file_candidate"; then
|
||||||
tmpfile=$(mktemp /tmp/dex.config.yaml-XXXXXX)
|
tmpfile=$(mktemp /tmp/dex.config.yaml-XXXXXX)
|
||||||
gomplate -f "$file_candidate" -o "$tmpfile"
|
gomplate -f "$file_candidate" -o "$tmpfile"
|
||||||
echo "config rendered successfully into the tmp file ${tmpfile}"
|
|
||||||
|
|
||||||
args="${args} ${tmpfile}"
|
args="${args} ${tmpfile}"
|
||||||
else
|
else
|
||||||
|
|
Reference in a new issue