发布 v3.1.0

docker/deploy.sh

@@ -22,11 +22,16 @@ port(){
 
 ##放置挂载文件
 mount(){
-	#挂载配置文件
+	#挂载 nginx 配置文件
 	if test ! -f "/docker/nginx/conf/nginx.conf" ;then
 		mkdir -p /docker/nginx/conf
 		cp nginx/nginx.conf /docker/nginx/conf/nginx.conf
 	fi
+	#挂载 redis 配置文件
+	if test ! -f "/docker/redis/conf/redis.conf" ;then
+		mkdir -p /docker/redis/conf
+		cp redis/redis.conf /docker/redis/conf/redis.conf
+	fi
 }
 
 #启动基础模块

docker/docker-compose.yml

@@ -65,10 +65,10 @@ services:
       TZ: Asia/Shanghai
     volumes:
       # 配置文件
-      - /docker/redis/conf/redis.conf:/redis.conf:rw
+      - /docker/redis/conf:/redis/config:rw
       # 数据文件
-      - /docker/redis/data:/data:rw
-    command: "redis-server --appendonly yes"
+      - /docker/redis/data:/redis/data:rw
+    command: "redis-server /redis/config/redis.conf --appendonly yes"
     privileged: true
     restart: always
     networks:
@@ -77,7 +77,7 @@ services:
 
   minio:
     image: minio/minio:RELEASE.2021-07-08T01-15-01Z
-    hostname: "minio"
+    container_name: minio
     ports:
       # api 端口
       - 9000:9000
@@ -103,14 +103,14 @@ services:
         ipv4_address: 172.30.0.54
 
   ruoyi-server1:
-    image: "ruoyi/ruoyi-server:3.0.0"
+    image: "ruoyi/ruoyi-server:3.1.0"
+    container_name: ruoyi-server1
     environment:
       # 时区上海
       TZ: Asia/Shanghai
     volumes:
       # 配置文件
       - /docker/server1/logs/:/ruoyi/server/logs/
-      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
     privileged: true
     restart: always
     networks:
@@ -118,14 +118,14 @@ services:
         ipv4_address: 172.30.0.60
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:3.0.0"
+    image: "ruoyi/ruoyi-server:3.1.0"
+    container_name: ruoyi-server2
     environment:
       # 时区上海
       TZ: Asia/Shanghai
     volumes:
       # 配置文件
       - /docker/server2/logs/:/ruoyi/server/logs/
-      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
     privileged: true
     restart: always
     networks:
@@ -133,7 +133,8 @@ services:
         ipv4_address: 172.30.0.61
 
   ruoyi-monitor-admin:
-    image: "ruoyi/ruoyi-monitor-admin:3.0.0"
+    image: "ruoyi/ruoyi-monitor-admin:3.1.0"
+    container_name: ruoyi-monitor-admin
     environment:
       # 时区上海
       TZ: Asia/Shanghai

docker/nginx/nginx.conf

@@ -22,6 +22,7 @@ http {
     access_log  /var/log/nginx/access.log  main;
 
 	upstream server {
+	    ip_hash;
 		server 172.30.0.60:8080;
 		server 172.30.0.61:8080;
 	}

docker/redis/redis.conf

@@ -0,0 +1,2 @@
+# redis 密码
+# requirepass 123456