diff --git a/docker/deploy.sh b/docker/deploy.sh index bbfdaf42..69b529a4 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -16,9 +16,9 @@ port(){ ##放置挂载文件 mount(){ #挂载配置文件 - if test ! -f "/docker/nginx/nginx.conf" ;then - mkdir -p /docker/nginx - cp nginx/nginx.conf /docker/nginx/nginx.conf + if test ! -f "/docker/nginx/conf/nginx.conf" ;then + mkdir -p /docker/nginx/conf + cp nginx/nginx.conf /docker/nginx/conf/nginx.conf fi } @@ -64,13 +64,13 @@ case "$1" in base ;; "start") - modules + start ;; "stop") - stopmodules + stop ;; "stopall") - stop + stopall ;; "rm") rm diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index f0f50191..93c18f4d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -18,8 +18,6 @@ services: - /docker/mysql/data/:/var/lib/mysql/ # 配置挂载 - /docker/mysql/conf/:/etc/mysql/conf.d/ - # 初始化目录挂载 - - /docker/mysql/init/:/docker-entrypoint-initdb.d/ command: # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配) --default-authentication-plugin=mysql_native_password @@ -81,6 +79,9 @@ services: image: "ruoyi/ruoyi-admin:2.4.0" environment: - TZ=Asia/Shanghai + volumes: + # 配置文件 + - /docker/server/logs/:/ruoyi/server/logs/ privileged: true restart: always networks: diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index a3c4dc14..88f4932b 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -2,9 +2,10 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/admin +RUN mkdir -p /ruoyi/server +RUN mkdir -p /ruoyi/server/logs -WORKDIR /ruoyi/admin +WORKDIR /ruoyi/server EXPOSE 8080