Merge branch 'main' of github.com:flipped-aurora/gin-vue-admin

server/Dockerfile

@@ -3,20 +3,22 @@ FROM golang:alpine as builder
 WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
 COPY . .
 
-RUN go env -w GO111MODULE=on
-RUN go env -w GOPROXY=https://goproxy.cn,direct
-RUN go env -w CGO_ENABLED=0
-RUN go env
-RUN go mod tidy
-RUN go build -o server .
+RUN go env -w GO111MODULE=on \
+    && go env -w GOPROXY=https://goproxy.cn,direct \
+    && go env -w CGO_ENABLED=0 \
+    && go env \
+    && go mod tidy \
+    && go build -o server .
 
 FROM alpine:latest
+
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
 
 WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
 
-COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server ./
+COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/server ./
+COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/resource ./resource/
+COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml ./
 
 EXPOSE 8888
-
 ENTRYPOINT ./server -c config.docker.yaml

web/Dockerfile

@@ -1,10 +1,9 @@
-FROM node:12.16.1
+FROM node:16
 
 WORKDIR /gva_web/
 COPY . .
 
-RUN npm install
-RUN npm run build
+RUN yarn && yarn build
 
 FROM nginx:alpine
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"