!69 同步dev分支 Merge pull request !69 from 疯狂的狮子Li/dev

疯狂的狮子Li

2021-07-13 83905db7170ea5981949e0f4b56695fb4ee02c83

 docker/docker-compose.yml

@@ -76,12 +76,13 @@
        ipv4_address: 172.30.0.48

  ruoyi-server1:
    image: "ruoyi/ruoyi-server:2.5.0"
    image: "ruoyi/ruoyi-server:2.5.1"
    environment:
      - TZ=Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/server1/logs/:/ruoyi/server/logs/
      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
    privileged: true
    restart: always
    networks:
@@ -89,12 +90,13 @@
        ipv4_address: 172.30.0.60

  ruoyi-server2:
    image: "ruoyi/ruoyi-server:2.5.0"
    image: "ruoyi/ruoyi-server:2.5.1"
    environment:
      - TZ=Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/server2/logs/:/ruoyi/server/logs/
      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
    privileged: true
    restart: always
    networks:
@@ -102,7 +104,7 @@
        ipv4_address: 172.30.0.61

  ruoyi-monitor-admin:
    image: "ruoyi/ruoyi-monitor-admin:2.5.0"
    image: "ruoyi/ruoyi-monitor-admin:2.5.1"
    environment:
      - TZ=Asia/Shanghai
    privileged: true