From 2d2e06dfc067ca02a53eeb1042fb1962cb766b8c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 31 一月 2023 10:41:01 +0800
Subject: [PATCH] !281 【轻量级 PR】升级 Docker 镜像 JDK 版本 Merge pull request !281 from MichelleChung/5.X

---
 script/docker/docker-compose.yml |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 57a7359..9d56cc9 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -2,7 +2,7 @@
 
 services:
   mysql:
-    image: mysql:8.0.29
+    image: mysql:8.0.31
     container_name: mysql
     environment:
       # 鏃跺尯涓婃捣
@@ -29,7 +29,7 @@
     network_mode: "host"
 
   nginx-web:
-    image: nginx:1.21.6
+    image: nginx:1.22.1
     container_name: nginx-web
     environment:
       # 鏃跺尯涓婃捣
@@ -78,11 +78,12 @@
       # 鏃跺尯涓婃捣
       TZ: Asia/Shanghai
       # 绠$悊鍚庡彴鐢ㄦ埛鍚�
-      MINIO_ACCESS_KEY: ruoyi
+      MINIO_ROOT_USER: ruoyi
       # 绠$悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
-      MINIO_SECRET_KEY: ruoyi123
+      MINIO_ROOT_PASSWORD: ruoyi123
       # https闇�瑕佹寚瀹氬煙鍚�
-      MINIO_SERVER_URL: ""
+      #MINIO_SERVER_URL: "https://xxx.com:9000"
+      #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
       # 寮�鍚帇缂� on 寮�鍚� off 鍏抽棴
       MINIO_COMPRESS: "off"
       # 鎵╁睍鍚� .pdf,.doc 涓虹┖ 鎵�鏈夌被鍨嬪潎鍘嬬缉
@@ -99,7 +100,7 @@
     network_mode: "host"
 
   ruoyi-server1:
-    image: ruoyi/ruoyi-server:4.3.0-beta2
+    image: ruoyi/ruoyi-server:5.0.0-SNAPSHOT
     container_name: ruoyi-server1
     environment:
       # 鏃跺尯涓婃捣
@@ -108,11 +109,13 @@
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/server1/logs/:/ruoyi/server/logs/
+      # skywalking 鎺㈤拡
+#      - /docker/skywalking/agent/:/ruoyi/skywalking/agent
     privileged: true
     network_mode: "host"
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:4.3.0-beta2"
+    image: "ruoyi/ruoyi-server:5.0.0-SNAPSHOT"
     container_name: ruoyi-server2
     environment:
       # 鏃跺尯涓婃捣
@@ -121,11 +124,13 @@
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/server2/logs/:/ruoyi/server/logs/
+      # skywalking 鎺㈤拡
+#      - /docker/skywalking/agent/:/ruoyi/skywalking/agent
     privileged: true
     network_mode: "host"
 
   ruoyi-monitor-admin:
-    image: ruoyi/ruoyi-monitor-admin:4.3.0-beta2
+    image: ruoyi/ruoyi-monitor-admin:5.0.0-SNAPSHOT
     container_name: ruoyi-monitor-admin
     environment:
       # 鏃跺尯涓婃捣
@@ -137,7 +142,7 @@
     network_mode: "host"
 
   ruoyi-xxl-job-admin:
-    image: ruoyi/ruoyi-xxl-job-admin:4.3.0-beta2
+    image: ruoyi/ruoyi-xxl-job-admin:5.0.0-SNAPSHOT
     container_name: ruoyi-xxl-job-admin
     environment:
       # 鏃跺尯涓婃捣

--
Gitblit v1.9.3