From 8df208785f03261cb3b1799ae0ec1ac9c0367de6 Mon Sep 17 00:00:00 2001 From: pnoker Date: Thu, 18 May 2023 00:15:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E5=86=99=E6=8C=87=E4=BB=A4=E6=90=BA=E5=B8=A6=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E8=AF=BB=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dc3/demo/docker-compose.yml | 56 +++++++++++++++++----------------- dc3/docker-compose-dev.yml | 61 +++++++++++++++++++------------------ pom.xml | 2 +- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/dc3/demo/docker-compose.yml b/dc3/demo/docker-compose.yml index 08e50fc3e..14665a9e1 100644 --- a/dc3/demo/docker-compose.yml +++ b/dc3/demo/docker-compose.yml @@ -60,34 +60,6 @@ services: aliases: - dc3-gateway - register: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-register:2023.4.0.demo - restart: always - environment: - - PREFER_HOST_MODE=hostname - - MODE=standalone - - SPRING_DATASOURCE_PLATFORM=mysql - - JVM_XMS=512m - - JVM_XMX=512m - - JVM_XMN=256m - - JVM_MS=128m - - JVM_MMS=256m - container_name: dc3-demo-center-register - hostname: dc3-center-register - depends_on: - - mysql - volumes: - - demo_logs:/dc3-center/dc3-center-register/dc3/logs - logging: - driver: json-file - options: - max-size: '20m' - max-file: '20' - networks: - dc3demonet: - aliases: - - dc3-center-register - auth: image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-auth:2023.4.0.demo restart: always @@ -187,6 +159,34 @@ services: aliases: - dc3-driver-virtual + register: + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-register:2023.4.0.demo + restart: always + environment: + - PREFER_HOST_MODE=hostname + - MODE=standalone + - SPRING_DATASOURCE_PLATFORM=mysql + - JVM_XMS=512m + - JVM_XMX=512m + - JVM_XMN=256m + - JVM_MS=128m + - JVM_MMS=256m + container_name: dc3-demo-center-register + hostname: dc3-center-register + depends_on: + - mysql + volumes: + - demo_logs:/dc3-center/dc3-center-register/dc3/logs + logging: + driver: json-file + options: + max-size: '20m' + max-file: '20' + networks: + dc3demonet: + aliases: + - dc3-center-register + mysql: image: registry.cn-beijing.aliyuncs.com/dc3/dc3-mysql:2023.4.0.demo restart: always diff --git a/dc3/docker-compose-dev.yml b/dc3/docker-compose-dev.yml index 98c8c2ab8..edaa4c62b 100644 --- a/dc3/docker-compose-dev.yml +++ b/dc3/docker-compose-dev.yml @@ -17,6 +17,37 @@ version: '3' services: + register: + image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-register:4.0.0-nacos + restart: on-failure + ports: + - "8848:8848" + - "9848:9848" + - "9555:9555" + environment: + - PREFER_HOST_MODE=hostname + - MODE=standalone + - SPRING_DATASOURCE_PLATFORM=mysql + - JVM_XMS=512m + - JVM_XMX=512m + - JVM_XMN=256m + - JVM_MS=128m + - JVM_MMS=256m + container_name: dc3-center-register + hostname: dc3-center-register + depends_on: + - mysql + volumes: + - logs:/home/nacos/logs + logging: + driver: json-file + options: + max-size: '20m' + max-file: '20' + networks: + dc3net: + aliases: + - dc3-center-register mysql: image: registry.cn-beijing.aliyuncs.com/dc3/dc3-mysql:2023.4.0.dev restart: on-failure @@ -100,36 +131,6 @@ services: aliases: - dc3-rabbitmq - register: - image: registry.cn-beijing.aliyuncs.com/dc3/dc3-center-register:4.0.0-nacos - restart: on-failure - ports: - - "8848:8848" - - "9848:9848" - - "9555:9555" - environment: - - PREFER_HOST_MODE=hostname - - MODE=standalone - - SPRING_DATASOURCE_PLATFORM=mysql - - JVM_XMS=512m - - JVM_XMX=512m - - JVM_XMN=256m - - JVM_MS=128m - - JVM_MMS=256m - container_name: dc3-center-register - hostname: dc3-center-register - volumes: - - logs:/home/nacos/logs - logging: - driver: json-file - options: - max-size: '20m' - max-file: '20' - networks: - dc3net: - aliases: - - dc3-center-register - portainer: image: portainer/portainer:1.24.2 command: -H unix:///var/run/docker.sock diff --git a/pom.xml b/pom.xml index 666ec2ee8..20ece04ef 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.github.pnoker dc3-parent - 2023.4.0-SNAPSHOT + 2023.4.0.2 ${project.artifactId}