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

疯狂的狮子li

2021-10-20 82f1f5d0cf1b51a5d81915e842e01760f404fa74

 docker/docker-compose.yml

@@ -18,8 +18,6 @@
      - /docker/mysql/data/:/var/lib/mysql/
      # 配置挂载
      - /docker/mysql/conf/:/etc/mysql/conf.d/
      # 主机本机时间文件映射 与本机时间同步
      - /etc/localtime:/etc/localtime:ro
    command:
      # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
      --default-authentication-plugin=mysql_native_password
@@ -37,6 +35,9 @@
    # 如果需要指定版本 就把 latest 换成版本号
    image: nginx:latest
    container_name: nginx-web
    environment:
      # 时区上海
      TZ: Asia/Shanghai
    ports:
      - 80:80
      - 443:443
@@ -49,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:
@@ -62,17 +61,14 @@
    ports:
      - 6379:6379
    environment:
      # 设置环境变量 时区上海 编码UTF-8
      # 时区上海
      TZ: Asia/Shanghai
      LANG: en_US.UTF-8
    volumes:
      # 配置文件
      - /docker/redis/conf/redis.conf:/redis.conf:rw
      - /docker/redis/conf:/redis/config:rw
      # 数据文件
      - /docker/redis/data:/data:rw
      # 主机本机时间文件映射 与本机时间同步
      - /etc/localtime:/etc/localtime:ro
    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:
@@ -81,13 +77,15 @@

  minio:
    image: minio/minio:RELEASE.2021-07-08T01-15-01Z
    hostname: "minio"
    container_name: minio
    ports:
      # api 端口
      - 9000:9000
      # 控制台端口
      - 9001:9001
    environment:
      # 时区上海
      TZ: Asia/Shanghai
      # 管理后台用户名
      MINIO_ACCESS_KEY: ruoyi
      # 管理后台密码，最小8个字符
@@ -97,8 +95,6 @@
      - /docker/minio/data:/data
      # 映射配置目录
      - /docker/minio/config:/root/.minio/
      # 主机本机时间文件映射 与本机时间同步
      - /etc/localtime:/etc/localtime:ro
    command: server --console-address ':9001' /data  # 指定容器中的目录 /data
    privileged: true
    restart: always
@@ -107,13 +103,14 @@
        ipv4_address: 172.30.0.54

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

  ruoyi-server2:
    image: "ruoyi/ruoyi-server:2.5.1"
    image: "ruoyi/ruoyi-server:3.2.0"
    container_name: ruoyi-server2
    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:
@@ -135,15 +133,35 @@
        ipv4_address: 172.30.0.61

  ruoyi-monitor-admin:
    image: "ruoyi/ruoyi-monitor-admin:2.5.1"
    image: "ruoyi/ruoyi-monitor-admin:3.2.0"
    container_name: ruoyi-monitor-admin
    environment:
      - TZ=Asia/Shanghai
      # 时区上海
      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