Merge pull request #1 from flipped-aurora/master

拉取master

Author: bypanghu

.dockerignore

@@ -10,8 +10,8 @@ networks:
 services:
   web:
     build:
-      context: ./
-      dockerfile: ./dockerfile_web
+      context: ./web
+      dockerfile: ./Dockerfile
     container_name: gva-web
     restart: always
     ports:
@@ -25,8 +25,8 @@ services:
 
   server:
     build:
-      context: ./
-      dockerfile: ./dockerfile_server
+      context: ./server
+      dockerfile: ./Dockerfile
     container_name: gva-server
     restart: always
     ports:

Dockerfile

@@ -2,19 +2,18 @@ FROM golang:alpine
 
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.io,direct
-
 WORKDIR /go/src/gin-vue-admin
 COPY . .
+
 RUN go env && go build -o server .
 
 FROM alpine:latest
 LABEL MAINTAINER="SliverHorn@[email protected]"
 
 WORKDIR /go/src/gin-vue-admin
-COPY --from=0 /go/src/gin-vue-admin/server ./
-COPY --from=0 /go/src/gin-vue-admin/config.yaml ./
-COPY --from=0 /go/src/gin-vue-admin/resource ./resource
+
+COPY --from=0 /go/src/gin-vue-admin ./
 
 EXPOSE 8888
 
-ENTRYPOINT ./server
+ENTRYPOINT ./server -c config.docker.yaml

docker-compose.yaml

@@ -43,7 +43,7 @@ system:
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
   db-type: 'mysql'
-  oss-type: 'local'    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
   use-multipoint: false
 
 # captcha configuration
@@ -85,7 +85,7 @@ autocode:
   web-form: /view
   web-table: /view
 
-# qiniu configuration (请自行申请七牛对应的 公钥 私钥 bucket 和 域名地址)
+# qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址)
 qiniu:
   zone: 'ZoneHuaDong'
   bucket: ''

docker/docker-start.sh

@@ -0,0 +1 @@
+node_modules/