From 42295ef2ac0a5e78674cf24b62d6834138f0ffdc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 29 十一月 2021 13:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
script/docker/docker-compose.yml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index c73a93c..3782823 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -2,7 +2,7 @@
services:
mysql:
- image: mysql:8.0.24
+ image: mysql:8.0.27
container_name: mysql
environment:
# 鏃跺尯涓婃捣
@@ -32,8 +32,7 @@
ipv4_address: 172.30.0.36
nginx-web:
- # 濡傛灉闇�瑕佹寚瀹氱増鏈� 灏辨妸 latest 鎹㈡垚鐗堟湰鍙�
- image: nginx:latest
+ image: nginx:1.21.3
container_name: nginx-web
environment:
# 鏃跺尯涓婃捣
@@ -56,7 +55,7 @@
- ruoyi_net
redis:
- image: redis:6.2.1
+ image: redis:6.2.6
container_name: redis
ports:
- 6379:6379
@@ -67,8 +66,8 @@
# 閰嶇疆鏂囦欢
- /docker/redis/conf:/redis/config:rw
# 鏁版嵁鏂囦欢
- - /docker/redis/data:/redis/data:rw
- command: "redis-server /redis/config/redis.conf --appendonly yes"
+ - /docker/redis/data/:/redis/data/:rw
+ command: "redis-server /redis/config/redis.conf"
privileged: true
restart: always
networks:
@@ -76,7 +75,7 @@
ipv4_address: 172.30.0.48
minio:
- image: minio/minio:RELEASE.2021-07-08T01-15-01Z
+ image: minio/minio:RELEASE.2021-10-27T16-29-42Z
container_name: minio
ports:
# api 绔彛
--
Gitblit v1.9.3