Merge pull request #1426 from justaugustus/image

Update Docker build/image
This commit is contained in:
Eric Chiang 2019-04-16 14:47:08 -07:00 committed by GitHub
commit 29d8428387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,11 +1,11 @@
FROM golang:1.11.5-alpine FROM golang:1.12.4-alpine
RUN apk add --no-cache --update alpine-sdk RUN apk add --no-cache --update alpine-sdk
COPY . /go/src/github.com/dexidp/dex COPY . /go/src/github.com/dexidp/dex
RUN cd /go/src/github.com/dexidp/dex && make release-binary RUN cd /go/src/github.com/dexidp/dex && make release-binary
FROM alpine:3.8 FROM alpine:3.9
# Dex connectors, such as GitHub and Google logins require root certificates. # Dex connectors, such as GitHub and Google logins require root certificates.
# Proper installations should manage those certificates, but it's a bad user # Proper installations should manage those certificates, but it's a bad user
# experience when this doesn't work out of the box. # experience when this doesn't work out of the box.
@ -13,6 +13,7 @@ FROM alpine:3.8
# OpenSSL is required so wget can query HTTPS endpoints for health checking. # OpenSSL is required so wget can query HTTPS endpoints for health checking.
RUN apk add --update ca-certificates openssl RUN apk add --update ca-certificates openssl
USER 1001:1001
COPY --from=0 /go/bin/dex /usr/local/bin/dex COPY --from=0 /go/bin/dex /usr/local/bin/dex
# Import frontend assets and set the correct CWD directory so the assets # Import frontend assets and set the correct CWD directory so the assets