From 2c2dad24d59b37df254d1c003d6c3e1119b51d6c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 11 八月 2021 14:28:05 +0800
Subject: [PATCH] update 更新 阿里云 maven源 新地址

---
 docker/docker-compose.yml |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 4a720b6..3302023 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -35,6 +35,9 @@
     # 濡傛灉闇�瑕佹寚瀹氱増鏈� 灏辨妸 latest 鎹㈡垚鐗堟湰鍙�
     image: nginx:latest
     container_name: nginx-web
+    environment:
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     ports:
       - 80:80
       - 443:443
@@ -47,8 +50,6 @@
       - /docker/nginx/html:/usr/share/nginx/html
       # 鏃ュ織鐩綍
       - /docker/nginx/log:/var/log/nginx
-      # 涓绘満鏈満鏃堕棿鏂囦欢鏄犲皠 涓庢湰鏈烘椂闂村悓姝�
-      - /etc/localtime:/etc/localtime:ro
     privileged: true
     restart: always
     networks:
@@ -60,9 +61,8 @@
     ports:
       - 6379:6379
     environment:
-      # 璁剧疆鐜鍙橀噺 鏃跺尯涓婃捣 缂栫爜UTF-8
+      # 鏃跺尯涓婃捣
       TZ: Asia/Shanghai
-      LANG: en_US.UTF-8
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/redis/conf/redis.conf:/redis.conf:rw
@@ -75,13 +75,42 @@
       ruoyi_net:
         ipv4_address: 172.30.0.48
 
-  ruoyi-server1:
-    image: "ruoyi/ruoyi-server:2.4.0"
+  minio:
+    image: minio/minio:RELEASE.2021-07-08T01-15-01Z
+    hostname: "minio"
+    ports:
+      # api 绔彛
+      - 9000:9000
+      # 鎺у埗鍙扮鍙�
+      - 9001:9001
     environment:
-      - TZ=Asia/Shanghai
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
+      # 绠$悊鍚庡彴鐢ㄦ埛鍚�
+      MINIO_ACCESS_KEY: ruoyi
+      # 绠$悊鍚庡彴瀵嗙爜锛屾渶灏�8涓瓧绗�
+      MINIO_SECRET_KEY: ruoyi123
+    volumes:
+      # 鏄犲皠褰撳墠鐩綍涓嬬殑data鐩綍鑷冲鍣ㄥ唴/data鐩綍
+      - /docker/minio/data:/data
+      # 鏄犲皠閰嶇疆鐩綍
+      - /docker/minio/config:/root/.minio/
+    command: server --console-address ':9001' /data  # 鎸囧畾瀹瑰櫒涓殑鐩綍 /data
+    privileged: true
+    restart: always
+    networks:
+      ruoyi_net:
+        ipv4_address: 172.30.0.54
+
+  ruoyi-server1:
+    image: "ruoyi/ruoyi-server:2.6.0"
+    environment:
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/server1/logs/:/ruoyi/server/logs/
+      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
     privileged: true
     restart: always
     networks:
@@ -89,18 +118,31 @@
         ipv4_address: 172.30.0.60
 
   ruoyi-server2:
-    image: "ruoyi/ruoyi-server:2.4.0"
+    image: "ruoyi/ruoyi-server:2.6.0"
     environment:
-      - TZ=Asia/Shanghai
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
     volumes:
       # 閰嶇疆鏂囦欢
       - /docker/server2/logs/:/ruoyi/server/logs/
+      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
     privileged: true
     restart: always
     networks:
       ruoyi_net:
         ipv4_address: 172.30.0.61
 
+  ruoyi-monitor-admin:
+    image: "ruoyi/ruoyi-monitor-admin:2.6.0"
+    environment:
+      # 鏃跺尯涓婃捣
+      TZ: Asia/Shanghai
+    privileged: true
+    restart: always
+    networks:
+      ruoyi_net:
+        ipv4_address: 172.30.0.90
+
 networks:
   ruoyi_net:
     driver: bridge

--
Gitblit v1.9.3