From dc662276c22e7c822cc20de7f1440fbc33e9fd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 16:19:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0minio=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 8 -------- docker/docker-compose.yml | 35 ----------------------------------- 2 files changed, 43 deletions(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index f4766e7..25e5db6 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -44,10 +44,6 @@ infrastructure: docker_service: ruoyi-nacos wait_time: 20 # Nacos 需要等待 MySQL 就绪 - - name: thingsboard-postgres - docker_service: thingsboard-postgres - wait_time: 20 # PostgreSQL 需要时间初始化 - - name: zlmediakit docker_service: zlmediakit wait_time: 10 # 流媒体服务器启动较快 @@ -66,10 +62,6 @@ infrastructure: - cp -r wvpweb/dist docker/wvp/web/html/dist wait_time: 10 # Nginx 启动较快 - - name: thingsboard-ce - docker_service: thingsboard-ce - wait_time: 40 # ThingsBoard 需要等待 PostgreSQL 并初始化 - # Git 仓库配置 repositories: # 认证服务 diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 3b6732d..792f052 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -381,38 +381,3 @@ services: - wvp-pro links: - wvp-pro - thingsboard-postgres: - container_name: thingsboard-postgres - image: registry.t-aaron.com/postgres:16 - restart: always - environment: - - TZ=Asia/Shanghai - - POSTGRES_DB=thingsboard - - POSTGRES_PASSWORD=postgres - ports: - - "5432:5432" - volumes: - - ./thingsboard/postgres-data:/var/lib/postgresql/data - thingsboard-ce: - container_name: thingsboard-ce - image: registry.t-aaron.com/thingsboard/tb-node:4.2.1.1 - restart: always - environment: - - TZ=Asia/Shanghai - - TB_SERVICE_ID=tb-ce-node - - SPRING_DATASOURCE_URL=jdbc:postgresql://thingsboard-postgres:5432/thingsboard - ports: - - "18081:8080" - - "7070:7070" - - "1883:1883" - - "8883:8883" - - "5683-5688:5683-5688/udp" - logging: - driver: "json-file" - options: - max-size: "100m" - max-file: "10" - depends_on: - - thingsboard-postgres - links: - - thingsboard-postgres From 4bd07e816b265e4784fc2744fd5aae803b50d34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 16:36:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0minio=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/thingsboard/reademe.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/thingsboard/reademe.md b/docker/thingsboard/reademe.md index 614033d..72c9bb2 100644 --- a/docker/thingsboard/reademe.md +++ b/docker/thingsboard/reademe.md @@ -1,5 +1,7 @@ 会加入ruoyi的默认网络docker_default - +docker-compose down -v +#docker volume rm tb-postgres-data +docker network create docker_default #第一次的时候执行这个 docker-compose run --rm -e INSTALL_TB=true -e LOAD_DEMO=true thingsboard-ce docker-compose up -d From 8d9c9ab8f89664cb9c5c433fb428c3b371bff5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 16:40:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0minio=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/thingsboard/reademe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/thingsboard/reademe.md b/docker/thingsboard/reademe.md index 72c9bb2..5325480 100644 --- a/docker/thingsboard/reademe.md +++ b/docker/thingsboard/reademe.md @@ -1,7 +1,7 @@ 会加入ruoyi的默认网络docker_default docker-compose down -v #docker volume rm tb-postgres-data -docker network create docker_default +#docker network create docker_default #第一次的时候执行这个 docker-compose run --rm -e INSTALL_TB=true -e LOAD_DEMO=true thingsboard-ce docker-compose up -d From d4c00e552b5defd3151501162b25915ba0420150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 16:50:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0minio=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 792f052..7c2ae20 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -332,7 +332,7 @@ services: - RecordPushLive=false - RecordSip=false ports: - - "18080:18978" + - "28080:18978" - "5060:5060/udp" # - "6379:6379" volumes: From e037e0e11c2cc1e864eec99907526edd065749f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 16:51:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0minio=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 +- docker/thingsboard/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7c2ae20..792f052 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -332,7 +332,7 @@ services: - RecordPushLive=false - RecordSip=false ports: - - "28080:18978" + - "18080:18978" - "5060:5060/udp" # - "6379:6379" volumes: diff --git a/docker/thingsboard/docker-compose.yml b/docker/thingsboard/docker-compose.yml index 80b9032..7177445 100644 --- a/docker/thingsboard/docker-compose.yml +++ b/docker/thingsboard/docker-compose.yml @@ -13,7 +13,7 @@ services: restart: always image: "registry.t-aaron.com/thingsboard/tb-node:4.2.1.1" ports: - - "18080:8080" + - "28080:8080" - "7070:7070" - "1883:1883" - "8883:8883"