update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

疯狂的狮子li

2021-10-20 82f1f5d0cf1b51a5d81915e842e01760f404fa74

 docker/docker-compose.yml

@@ -65,10 +65,10 @@
      TZ: Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/redis/conf/redis.conf:/redis.conf:rw
      - /docker/redis/conf:/redis/config:rw
      # 数据文件
      - /docker/redis/data:/data:rw
    command: "redis-server --appendonly yes"
      - /docker/redis/data:/redis/data:rw
    command: "redis-server /redis/config/redis.conf --appendonly yes"
    privileged: true
    restart: always
    networks:
@@ -77,7 +77,7 @@

  minio:
    image: minio/minio:RELEASE.2021-07-08T01-15-01Z
    hostname: "minio"
    container_name: minio
    ports:
      # api 端口
      - 9000:9000
@@ -103,14 +103,14 @@
        ipv4_address: 172.30.0.54

  ruoyi-server1:
    image: "ruoyi/ruoyi-server:2.6.0"
    image: "ruoyi/ruoyi-server:3.2.0"
    container_name: ruoyi-server1
    environment:
      # 时区上海
      TZ: Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/server1/logs/:/ruoyi/server/logs/
      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
    privileged: true
    restart: always
    networks:
@@ -118,14 +118,14 @@
        ipv4_address: 172.30.0.60

  ruoyi-server2:
    image: "ruoyi/ruoyi-server:2.6.0"
    image: "ruoyi/ruoyi-server:3.2.0"
    container_name: ruoyi-server2
    environment:
      # 时区上海
      TZ: Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/server2/logs/:/ruoyi/server/logs/
      - /docker/ruoyi/uploadPath/:/ruoyi/server/ruoyi/uploadPath/
    privileged: true
    restart: always
    networks:
@@ -133,16 +133,35 @@
        ipv4_address: 172.30.0.61

  ruoyi-monitor-admin:
    image: "ruoyi/ruoyi-monitor-admin:2.6.0"
    image: "ruoyi/ruoyi-monitor-admin:3.2.0"
    container_name: ruoyi-monitor-admin
    environment:
      # 时区上海
      TZ: Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/monitor/logs/:/ruoyi/monitor/logs
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.90

  ruoyi-xxl-job-admin:
    image: "ruoyi/ruoyi-xxl-job-admin:3.2.0"
    container_name: ruoyi-xxl-job-admin
    environment:
      # 时区上海
      TZ: Asia/Shanghai
    volumes:
      # 配置文件
      - /docker/xxljob/logs/:/ruoyi/xxljob/logs
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.92

networks:
  ruoyi_net:
    driver: bridge