Unverified Commit fdbefa80 authored by Matt Baer's avatar Matt Baer Committed by GitHub

Merge pull request #95 from TeDomum/master

Fix the build in Docker after enabling go modules
parents 7a07e100 70f754e8
Pipeline #193 passed with stage
in 2 minutes and 40 seconds
# Build image # 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 apk add --update nodejs nodejs-npm make g++ git sqlite-dev
RUN npm install -g less less-plugin-clean-css 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 RUN mkdir -p /go/src/github.com/writeas/writefreely
WORKDIR /go/src/github.com/writeas/writefreely WORKDIR /go/src/github.com/writeas/writefreely
COPY . . COPY . .
ENV GO111MODULE=on
RUN make build \ RUN make build \
&& make ui && make ui
RUN mkdir /stage && \ RUN mkdir /stage && \
...@@ -16,6 +18,7 @@ RUN mkdir /stage && \ ...@@ -16,6 +18,7 @@ RUN mkdir /stage && \
/go/src/github.com/writeas/writefreely/static \ /go/src/github.com/writeas/writefreely/static \
/go/src/github.com/writeas/writefreely/pages \ /go/src/github.com/writeas/writefreely/pages \
/go/src/github.com/writeas/writefreely/keys \ /go/src/github.com/writeas/writefreely/keys \
/go/src/github.com/writeas/writefreely/cmd \
/stage /stage
# Final image # Final image
...@@ -29,4 +32,4 @@ VOLUME /go/keys ...@@ -29,4 +32,4 @@ VOLUME /go/keys
EXPOSE 8080 EXPOSE 8080
USER daemon USER daemon
CMD ["bin/writefreely"] ENTRYPOINT ["cmd/writefreely/writefreely"]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment