Skip to content

Commit

Permalink
Merge pull request #11 from PasteUs/dev
Browse files Browse the repository at this point in the history
Remove npm mirror and golang proxy
  • Loading branch information
LucienShui authored Nov 26, 2019
2 parents 94818b3 + 9e059ff commit 334a139
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/DEPLOY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 334a139

Please sign in to comment.