Merge pull request #1958 from dexidp/chore-docker-volume
Generic docker improvements
This commit is contained in:
commit
c41f970b16
35
Dockerfile
35
Dockerfile
@ -1,16 +1,14 @@
|
|||||||
FROM golang:1.15.7-alpine3.12
|
FROM golang:1.15.7-alpine3.13 AS builder
|
||||||
|
|
||||||
|
WORKDIR /usr/local/src/dex
|
||||||
|
|
||||||
|
RUN apk add --no-cache --update alpine-sdk
|
||||||
|
|
||||||
ARG TARGETOS
|
ARG TARGETOS
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
ARG TARGETVARIANT=""
|
ARG TARGETVARIANT=""
|
||||||
|
|
||||||
WORKDIR /usr/local/src/dex
|
ENV GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT}
|
||||||
|
|
||||||
ENV GOOS=${TARGETOS} \
|
|
||||||
GOARCH=${TARGETARCH} \
|
|
||||||
GOARM=${TARGETVARIANT}
|
|
||||||
|
|
||||||
RUN apk add --no-cache --update alpine-sdk
|
|
||||||
|
|
||||||
ARG GOPROXY
|
ARG GOPROXY
|
||||||
|
|
||||||
@ -24,8 +22,6 @@ RUN make release-binary
|
|||||||
|
|
||||||
FROM alpine:3.13.0
|
FROM alpine:3.13.0
|
||||||
|
|
||||||
WORKDIR /
|
|
||||||
|
|
||||||
# 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.
|
||||||
@ -33,17 +29,22 @@ WORKDIR /
|
|||||||
# 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 --no-cache --update ca-certificates openssl
|
RUN apk add --no-cache --update ca-certificates openssl
|
||||||
|
|
||||||
|
RUN mkdir -p /var/dex
|
||||||
|
RUN chown -R 1001:1001 /var/dex
|
||||||
|
|
||||||
|
# Copy module files for CVE scanning / dependency analysis.
|
||||||
|
COPY --from=builder /usr/local/src/dex/go.mod /usr/local/src/dex/go.sum /usr/local/src/dex/
|
||||||
|
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
|
||||||
|
|
||||||
USER 1001:1001
|
USER 1001:1001
|
||||||
|
|
||||||
COPY --from=0 /go/bin/dex /usr/local/bin/dex
|
|
||||||
|
|
||||||
# Copy module dependencies for CVE scanning / dependency analysis.
|
|
||||||
COPY go.mod go.sum /opt/dex/dependencies/
|
|
||||||
COPY api/v2/go.mod api/v2/go.sum /opt/dex/dependencies/api/v2/
|
|
||||||
|
|
||||||
# Import frontend assets and set the correct CWD directory so the assets
|
# Import frontend assets and set the correct CWD directory so the assets
|
||||||
# are in the default path.
|
# are in the default path.
|
||||||
COPY web web
|
COPY --from=builder /usr/local/src/dex/web /web
|
||||||
|
|
||||||
|
USER 1001:1001
|
||||||
|
|
||||||
ENTRYPOINT ["dex"]
|
ENTRYPOINT ["dex"]
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user