fix 修复升级合并错误

疯狂的狮子li

2021-07-12 cd34c87afa730c48e2b2be61d700b1fee409e02c

 docker/docker-compose.yml

@@ -76,7 +76,7 @@
        ipv4_address: 172.30.0.48

  ruoyi-server1:
    image: "ruoyi/ruoyi-server:2.4.0"
    image: "ruoyi/ruoyi-server:2.5.0"
    environment:
      - TZ=Asia/Shanghai
    volumes:
@@ -89,7 +89,7 @@
        ipv4_address: 172.30.0.60

  ruoyi-server2:
    image: "ruoyi/ruoyi-server:2.4.0"
    image: "ruoyi/ruoyi-server:2.5.0"
    environment:
      - TZ=Asia/Shanghai
    volumes:
@@ -101,6 +101,16 @@
      ruoyi_net:
        ipv4_address: 172.30.0.61

  ruoyi-monitor-admin:
    image: "ruoyi/ruoyi-monitor-admin:2.5.0"
    environment:
      - TZ=Asia/Shanghai
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.90

networks:
  ruoyi_net:
    driver: bridge