diff --git a/.docker-compose/shell/server-handle.sh b/.docker-compose/shell/server-handle.sh index 1b53cf5d03ba7d2153e54f526e49cc6451cc4c00..46cec0fccef4dd17f1c4da42521e0d9eb0a2c690 100644 --- 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 index b78711fc195bf5dafb38d439e194aa4c2cca767e..d997d79952f35bd0d28579a6b95aecb6dc68df46 100644 --- 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 index 9cba8a424726b3472b7532d5bfd722801074d30a..54d23ddad8de138fa00ab459e115be8bc7d49ef7 100644 --- 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