From 6a8e281b6684c4c39b910de3935eab63d301d88c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 08 七月 2021 20:06:06 +0800
Subject: [PATCH] update 更新docker脚本配置
---
docker/docker-compose.yml | 5 +++--
docker/deploy.sh | 12 ++++++------
ruoyi-admin/Dockerfile | 5 +++--
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/docker/deploy.sh b/docker/deploy.sh
index bbfdaf4..69b529a 100644
--- a/docker/deploy.sh
+++ b/docker/deploy.sh
@@ -16,9 +16,9 @@
##鏀剧疆鎸傝浇鏂囦欢
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 @@
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 f0f5019..93c18f4 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,8 +18,6 @@
- /docker/mysql/data/:/var/lib/mysql/
# 閰嶇疆鎸傝浇
- /docker/mysql/conf/:/etc/mysql/conf.d/
- # 鍒濆鍖栫洰褰曟寕杞�
- - /docker/mysql/init/:/docker-entrypoint-initdb.d/
command:
# 灏唌ysql8.0榛樿瀵嗙爜绛栫暐 淇敼涓� 鍘熷厛 绛栫暐 (mysql8.0瀵瑰叾榛樿绛栫暐鍋氫簡鏇存敼 浼氬鑷村瘑鐮佹棤娉曞尮閰�)
--default-authentication-plugin=mysql_native_password
@@ -81,6 +79,9 @@
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 a3c4dc1..88f4932 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -2,9 +2,10 @@
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
--
Gitblit v1.9.3