update docker-compose script and fix version (#1447)

apache · Dec 25, 2023 · dcee171 · dcee171
1 parent 059b519
commit dcee171
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 78 deletions.
diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml
@@ -109,7 +109,7 @@ warehouse:
       password: root
       # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0
       # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0
-      version: V_0_13
+      version: V_1_0
       query-timeout-in-ms: -1
       # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期）
       # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire)

diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose-1.0.yaml
diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-iotdb/docker-compose.yaml
@@ -37,7 +37,7 @@ services:
       - hertzbeat
 
   iotdb:
-    image: apache/iotdb:0.13.3-node
+    image: apache/iotdb:1.2.2-standalone
     container_name: compose-iotdb
     hostname: iotdb
     restart: always

diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/README.md b/script/docker-compose/hertzbeat-mysql-tdengine/README.md
@@ -43,8 +43,8 @@
    Execute the create database command
 
    `taos> show databases;`
-   
-   `taos> CREATE DATABASE hertzbeat KEEP 90 DAYS 10 BLOCKS 6 UPDATE 1;`
+
+   `taos> CREATE DATABASE hertzbeat KEEP 90 DURATION 10 BUFFER 16;`
 
 ##### Restart the application
 

diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md b/script/docker-compose/hertzbeat-mysql-tdengine/README_CN.md
@@ -45,7 +45,7 @@
 
    `taos> show databases;`
 
-   `taos> CREATE DATABASE hertzbeat KEEP 90 DAYS 10 BLOCKS 6 UPDATE 1;`
+   `taos> CREATE DATABASE hertzbeat KEEP 90 DURATION 10 BUFFER 16;`
 
 ##### 重启应用  
 

diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-tdengine/docker-compose.yaml
@@ -37,15 +37,14 @@ services:
       - hertzbeat
 
   tdengine:
-    image: tdengine/tdengine:2.4.0.12
+    image: tdengine/tdengine:3.2.2.0
     container_name: compose-tdengine
     hostname: tdengine
     restart: always
     environment:
       TZ: Asia/Shanghai
     ports:
-      - "6030-6049"
-      - "6030-6049/udp"
+      - "6041"
     volumes:
       - ./dbdata/taosdata:/var/lib/taos/
     networks:

diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/docker-compose.yaml
@@ -44,14 +44,14 @@ services:
     environment:
       TZ: Asia/Shanghai
     ports:
-      - "8428-8428"
+      - "8428"
     volumes:
       - ./dbdata/tsdbdata:/victoria-metrics-data
     networks:
       - hertzbeat
 
   hertzbeat:
-    image: tancloud/hertzbeat:v1.4.2
+    image: tancloud/hertzbeat
     container_name: compose-hertzbeat
     hostname: hertzbeat
     restart: always

diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-iotdb/conf/application.yml
@@ -113,7 +113,7 @@ warehouse:
       password: root
       # org.dromara.hertzbeat.warehouse.config.IotDbVersion: V_0_13 || V_1_0
       # 如果你使用docker-compose-1.0.yaml, 不要忘记修i该version为V_1_0
-      version: V_0_13
+      version: V_1_0
       query-timeout-in-ms: -1
       # 数据存储时间：默认'7776000000'（90天,单位为毫秒,-1代表永不过期）
       # data expire time, unit:ms, default '7776000000'(90 days, -1:never expire)

diff --git a/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml b/script/docker-compose/hertzbeat-postgresql-iotdb/docker-compose.yaml
@@ -37,7 +37,7 @@ services:
       - hertzbeat
 
   iotdb:
-    image: apache/iotdb:0.13.3-node
+    image: apache/iotdb:1.2.2-standalone
     container_name: compose-iotdb
     hostname: iotdb
     restart: always