修复v2.4.0的docker-compose的启动异常问题

SliverHorn · pixel · commit 97f51e8cfcbf · 2021-03-18T12:19:27.000+08:00
diff --git a/.docker-compose/shell/server-handle.sh b/.docker-compose/shell/server-handle.sh
@@ -61,11 +61,11 @@ captcha:
 
 # mysql connect configuration
 mysql:
-  path: '177.7.0.13:3306'
-  config: 'charset=utf8mb4&parseTime=True&loc=Local'
-  db-name: 'qmPlus'
-  username: 'root'
-  password: 'Aa@6447985'
+  path: ''
+  config: ''
+  db-name: ''
+  username: ''
+  password: ''
   max-idle-conns: 10
   max-open-conns: 100
   log-mode: false
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: "3.8"
+version: "3"
 
 networks:
   network:
diff --git a/dockerfile_server b/dockerfile_server
@@ -12,20 +12,17 @@ RUN sh ./server-handle.sh
 RUN rm -f server-handle.sh
 RUN cat ./config.yaml
 
-RUN go build -o gva cmd/main.go
 RUN go env && go build -o server .
 
-
 FROM alpine:latest
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
 
 WORKDIR /go/src/gin-vue-admin
 
-COPY --from=0 /go/src/gin-vue-admin/gva ./
 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
 
 EXPOSE 8888
 
-ENTRYPOINT ./gva initdb && ./server
+ENTRYPOINT ./server
