浏览代码

Merge pull request #95 from TeDomum/master

Fix the build in Docker after enabling go modules
tags/v0.9.1^0
Matt Baer 5 年前
committed by GitHub
父节点
当前提交
fdbefa806f
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. +5
    -2
      Dockerfile

+ 5
- 2
Dockerfile 查看文件

@@ -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"]

正在加载...
取消
保存