Merge pull request #95 from TeDomum/master

Fix the build in Docker after enabling go modules
This commit is contained in:
Matt Baer 2019-04-19 09:01:44 -04:00 committed by GitHub
commit fdbefa806f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions

View File

@ -1,13 +1,15 @@
# Build image
FROM golang:1.11.2-alpine3.8 as build
FROM golang:1.12-alpine as build
RUN apk add --update nodejs nodejs-npm make g++ git sqlite-dev
RUN npm install -g less less-plugin-clean-css
RUN go get -u github.com/jteeuwen/go-bindata/...
RUN mkdir -p /go/src/github.com/writeas/writefreely
WORKDIR /go/src/github.com/writeas/writefreely
COPY . .
ENV GO111MODULE=on
RUN make build \
&& make ui
RUN mkdir /stage && \
@ -16,6 +18,7 @@ RUN mkdir /stage && \
/go/src/github.com/writeas/writefreely/static \
/go/src/github.com/writeas/writefreely/pages \
/go/src/github.com/writeas/writefreely/keys \
/go/src/github.com/writeas/writefreely/cmd \
/stage
# Final image
@ -29,4 +32,4 @@ VOLUME /go/keys
EXPOSE 8080
USER daemon
CMD ["bin/writefreely"]
ENTRYPOINT ["cmd/writefreely/writefreely"]