diff --git a/pom.xml b/pom.xml index 452442d..082d0ad 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ dev - 192.168.110.149:18848 + 192.168.110.2:18848 DEFAULT_GROUP DEFAULT_GROUP nacos diff --git a/ruoyi-auth/Dockerfile b/ruoyi-auth/Dockerfile index c24c9e8..a489dd0 100644 --- a/ruoyi-auth/Dockerfile +++ b/ruoyi-auth/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds +#FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" @@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/auth/logs \ WORKDIR /ruoyi/auth -ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" +ENV SERVER_PORT=19210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} diff --git a/ruoyi-modules/ruoyi-resource/Dockerfile b/ruoyi-modules/ruoyi-resource/Dockerfile index 93009c0..c15c863 100644 --- a/ruoyi-modules/ruoyi-resource/Dockerfile +++ b/ruoyi-modules/ruoyi-resource/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds +#FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-synjinlangyun/Dockerfile b/ruoyi-modules/ruoyi-synjinlangyun/Dockerfile index 4f0cf29..98f555c 100644 --- a/ruoyi-modules/ruoyi-synjinlangyun/Dockerfile +++ b/ruoyi-modules/ruoyi-synjinlangyun/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds +#FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" @@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/synjinlangyun/logs \ WORKDIR /ruoyi/synjinlangyun -ENV SERVER_PORT=9201 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" +ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} diff --git a/ruoyi-modules/ruoyi-system/Dockerfile b/ruoyi-modules/ruoyi-system/Dockerfile index c6e8c64..aad2750 100644 --- a/ruoyi-modules/ruoyi-system/Dockerfile +++ b/ruoyi-modules/ruoyi-system/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds +#FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" diff --git a/ruoyi-modules/ruoyi-workflow/Dockerfile b/ruoyi-modules/ruoyi-workflow/Dockerfile index f3738ca..d060a54 100644 --- a/ruoyi-modules/ruoyi-workflow/Dockerfile +++ b/ruoyi-modules/ruoyi-workflow/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds +#FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" @@ -11,7 +11,7 @@ RUN mkdir -p /ruoyi/workflow/logs \ WORKDIR /ruoyi/workflow -ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" +ENV SERVER_PORT=19205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} diff --git a/ruoyi-modules/xny-ops/Dockerfile b/ruoyi-modules/xny-ops/Dockerfile index 5c8e48e..fe1c8a5 100644 --- a/ruoyi-modules/xny-ops/Dockerfile +++ b/ruoyi-modules/xny-ops/Dockerfile @@ -1,6 +1,6 @@ # 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/ -FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds -#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds +#FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds +FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds #FROM findepi/graalvm:java17-native LABEL maintainer="Lion Li" @@ -11,7 +11,7 @@ RUN mkdir -p /xny/ops/logs \ WORKDIR /xny/ops -ENV SERVER_PORT=19301 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" +ENV SERVER_PORT=9203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" EXPOSE ${SERVER_PORT} diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 124841f..217ec2e 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -31,16 +31,17 @@ services: container_name: nacos ports: - "18848:18848" - - "9848:9848" - - "9849:9849" + - "19848:19848" + - "19849:19849" environment: TZ: Asia/Shanghai JAVA_OPTS: "-Xms256m -Xmx512m" volumes: # 日志目录 注意集群模式下 日志目录不能一致 需要区分例如 nacos1 nacos2 - - /mnt/disk2/docker/nacos/logs/:/root/nacos/logs + - /mnt/disk1/docker/nacos/logs/:/root/nacos/logs # 集群配置文件 集群所有nacos都必须使用此文件 - - /mnt/disk2/docker/nacos/conf/cluster.conf:/root/nacos/conf/cluster.conf + - /mnt/disk1/docker/nacos/conf/cluster.conf:/root/nacos/conf/cluster.conf + restart: always network_mode: "xny-cloud" redis: @@ -106,9 +107,9 @@ services: # SEATA_IP: 127.0.0.1 SEATA_PORT: 8091 volumes: - - /docker/ruoyi-seata-server/logs/:/ruoyi/seata-server/logs + - /mnt/disk1/docker/ruoyi-seata-server/logs/:/ruoyi/seata-server/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -142,9 +143,9 @@ services: - "8718:8718" volumes: # 配置文件 - - /docker/ruoyi-sentinel-dashboard/logs/:/ruoyi/sentinel-dashboard/logs + - /mnt/disk1/docker/ruoyi-sentinel-dashboard/logs/:/ruoyi/sentinel-dashboard/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent restart: always network_mode: "xny-cloud" @@ -158,9 +159,9 @@ services: - "19100:19100" volumes: # 配置文件 - - /docker/ruoyi-monitor/logs/:/ruoyi/monitor/logs + - /mnt/disk1/docker/ruoyi-monitor/logs/:/ruoyi/monitor/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -174,7 +175,7 @@ services: - "8800:8800" - "17888:17888" volumes: - - /docker/snailjob/logs/:/ruoyi/snailjob/logs + - /mnt/disk1/docker/snailjob/logs/:/ruoyi/snailjob/logs privileged: true network_mode: "xny-cloud" @@ -188,9 +189,9 @@ services: - "18899:18899" volumes: # 配置文件 - - /docker/ruoyi-gateway/logs/:/ruoyi/gateway/logs + - /mnt/disk1/docker/ruoyi-gateway/logs/:/ruoyi/gateway/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -201,12 +202,12 @@ services: # 时区上海 TZ: Asia/Shanghai ports: - - "9210:9210" + - "19210:19210" volumes: # 配置文件 - - /docker/ruoyi-auth/logs/:/ruoyi/auth/logs + - /mnt/disk1/docker/ruoyi-auth/logs/:/ruoyi/auth/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -220,9 +221,41 @@ services: - "19201:19201" volumes: # 配置文件 - - /docker/ruoyi-system/logs/:/ruoyi/system/logs + - /mnt/disk1/docker/ruoyi-system/logs/:/ruoyi/system/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent + privileged: true + network_mode: "xny-cloud" + + xny-ops: + image: ruoyi/xny-ops:2.4.1 + container_name: xny-ops + environment: + # 时区上海 + TZ: Asia/Shanghai + ports: + - "9203:9203" + volumes: + # 配置文件 + - /mnt/disk1/docker/xny-ops/logs/:/ruoyi/system/logs + # skywalking 探针 + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent + privileged: true + network_mode: "xny-cloud" + + ruoyi-synjinlangyun: + image: ruoyi/ruoyi-synjinlangyun:2.4.1 + container_name: ruoyi-synjinlangyun + environment: + # 时区上海 + TZ: Asia/Shanghai + ports: + - "9202:9202" + volumes: + # 配置文件 + - /mnt/disk1/docker/ruoyi-synjinlangyun/logs/:/ruoyi/system/logs + # skywalking 探针 + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -236,9 +269,9 @@ services: - "19202:19202" volumes: # 配置文件 - - /docker/ruoyi-gen/logs/:/ruoyi/gen/logs + - /mnt/disk1/docker/ruoyi-gen/logs/:/ruoyi/gen/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -254,9 +287,9 @@ services: - "9203:9203" volumes: # 配置文件 - - /docker/ruoyi-job/logs/:/ruoyi/job/logs + - /mnt/disk1/docker/ruoyi-job/logs/:/ruoyi/job/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -270,9 +303,9 @@ services: - "19204:19204" volumes: # 配置文件 - - /docker/ruoyi-resource/logs/:/ruoyi/resource/logs + - /mnt/disk1/docker/ruoyi-resource/logs/:/ruoyi/resource/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud" @@ -286,9 +319,9 @@ services: - "19205:19205" volumes: # 配置文件 - - /docker/ruoyi-workflow/logs/:/ruoyi/workflow/logs + - /mnt/disk1/docker/ruoyi-workflow/logs/:/ruoyi/workflow/logs # skywalking 探针 - - /docker/skywalking/agent/:/ruoyi/skywalking/agent + - /mnt/disk1/docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "xny-cloud"