diff --git a/Dockerfile b/Dockerfile index b2b370e..4f32a36 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,19 +2,18 @@ FROM node:12 as frontend_builder COPY ./PasteMeFrontend /source COPY ./vue.config.js /source/vue.config.js WORKDIR /source -RUN npm install --registry=https://registry.npm.taobao.org +RUN npm install RUN npm run build RUN mv pasteme_frontend/usr/config.example.json pasteme_frontend/usr/config.json RUN rm -rf pasteme_frontend/conf.d pasteme_frontend/report.html FROM golang:1.13-alpine as backend_builder +RUN apk --no-cache add build-base COPY ./PasteMeGoBackend /go/src/github.com/PasteUs/PasteMeGoBackend COPY ./server.go /go/src/github.com/PasteUs/PasteMeGoBackend/server/server.go ENV GO111MODULE=on \ - GOPROXY=https://goproxy.io \ GOOS=linux WORKDIR /go/src/github.com/PasteUs/PasteMeGoBackend -RUN apk --no-cache add g++ RUN go mod download RUN go build main.go diff --git a/doc/DEPLOY.md b/doc/DEPLOY.md index d2503a2..f18a65e 100644 --- a/doc/DEPLOY.md +++ b/doc/DEPLOY.md @@ -15,7 +15,7 @@ docker run \ -d \ -p 80:8000 \ -v ${PWD}/backend/data/:/data/ \ - registry.cn-hangzhou.aliyuncs.com/pasteus/pasteme-lite:0.0.2 + registry.cn-hangzhou.aliyuncs.com/pasteus/pasteme-lite:0.0.3 ``` ## docker-compose diff --git a/docker-compose.yml b/docker-compose.yml index 7eae065..8a9e095 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: pasteme-lite: - image: registry.cn-hangzhou.aliyuncs.com/pasteus/pasteme-lite:0.0.2 + image: registry.cn-hangzhou.aliyuncs.com/pasteus/pasteme-lite:0.0.3 container_name: pasteme-lite healthcheck: test: ["CMD", "wget", "localhost:8000/?method=beat", "--output=/dev/null"]