From cc95d251d62903d6e96d9cf9c6ce426bec26556f Mon Sep 17 00:00:00 2001 From: Michael Li Date: Mon, 13 Aug 2018 20:50:25 +0800 Subject: docker: add new Dockerfile.docker-ce for docker-ce(>=v17.06) to build docker image (#5322) * add new Dockerfile.docker-ce for docker-ce(>=v17.06) to build docker image * change default Dockerfile to support docker-ce(>=v17.06) multi-stage build --- Dockerfile | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 035b59a4..b946fa7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,13 @@ -FROM alpine:3.5 +FROM golang:alpine AS binarybuilder +# Install build deps +RUN apk --no-cache --no-progress add --virtual build-deps build-base git linux-pam-dev +WORKDIR /go/src/github.com/gogs/gogs +COPY . . +RUN make build TAGS="sqlite cert pam" +FROM alpine:latest # Install system utils & Gogs runtime dependencies -ADD https://github.com/tianon/gosu/releases/download/1.9/gosu-amd64 /usr/sbin/gosu +ADD https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 /usr/sbin/gosu RUN chmod +x /usr/sbin/gosu \ && echo http://dl-2.alpinelinux.org/alpine/edge/community/ >> /etc/apk/repositories \ && apk --no-cache --no-progress add \ @@ -20,16 +26,14 @@ ENV GOGS_CUSTOM /data/gogs # Configure LibC Name Service COPY docker/nsswitch.conf /etc/nsswitch.conf -COPY docker /app/gogs/docker -COPY templates /app/gogs/templates -COPY public /app/gogs/public -WORKDIR /app/gogs/build -COPY . . +WORKDIR /app/gogs +COPY docker ./docker +COPY templates ./templates +COPY public ./public +COPY --from=binarybuilder /go/src/github.com/gogs/gogs/gogs . -RUN ./docker/build-go.sh \ - && ./docker/build.sh \ - && ./docker/finalize.sh +RUN ./docker/finalize.sh # Configure Docker Container VOLUME ["/data"] -- cgit v1.2.3