Fix GitHub Actions: use specific IoTDB versions and improve compatibility - Use apache/iotdb:1.3.6-confignode and apache/iotdb:1.3.6-datanode instead of latest - Remove obsolete version directive from docker-compose files - Add fallback to docker-compose command for better compatibility - Remove unnecessary entrypoint command overrides for confignode - Update documentation to reflect image version changes
diff --git a/.github/workflows/e2e-1c1d.yml b/.github/workflows/e2e-1c1d.yml index b207420..b5b2990 100644 --- a/.github/workflows/e2e-1c1d.yml +++ b/.github/workflows/e2e-1c1d.yml
@@ -29,12 +29,12 @@ - name: Run E2E tests with Docker Compose run: | - docker compose -f docker-compose-1c1d.yml up --build --abort-on-container-exit --exit-code-from iotdb-test + docker compose -f docker-compose-1c1d.yml up --build --abort-on-container-exit --exit-code-from iotdb-test || docker-compose -f docker-compose-1c1d.yml up --build --abort-on-container-exit --exit-code-from iotdb-test - name: Clean up if: always() run: | - docker compose -f docker-compose-1c1d.yml down -v + docker compose -f docker-compose-1c1d.yml down -v || docker-compose -f docker-compose-1c1d.yml down -v - name: Upload test results if: always()
diff --git a/.github/workflows/e2e-3c3d.yml b/.github/workflows/e2e-3c3d.yml index 5d8a481..1bb13c8 100644 --- a/.github/workflows/e2e-3c3d.yml +++ b/.github/workflows/e2e-3c3d.yml
@@ -29,12 +29,12 @@ - name: Run E2E tests with Docker Compose run: | - docker compose -f docker-compose-3c3d.yml up --build --abort-on-container-exit --exit-code-from iotdb-test + docker compose -f docker-compose-3c3d.yml up --build --abort-on-container-exit --exit-code-from iotdb-test || docker-compose -f docker-compose-3c3d.yml up --build --abort-on-container-exit --exit-code-from iotdb-test - name: Clean up if: always() run: | - docker compose -f docker-compose-3c3d.yml down -v + docker compose -f docker-compose-3c3d.yml down -v || docker-compose -f docker-compose-3c3d.yml down -v - name: Upload test results if: always()
diff --git a/CI_CD_SUMMARY.md b/CI_CD_SUMMARY.md index 6250174..435e8a9 100644 --- a/CI_CD_SUMMARY.md +++ b/CI_CD_SUMMARY.md
@@ -35,18 +35,19 @@ - Troubleshooting guide - Configuration reference -### Docker Compose Configurations +### Docker Configurations 1. **`docker-compose-1c1d.yml`** - Single node IoTDB setup - Services: 1 ConfigNode + 1 DataNode + test container - - Uses `apache/iotdb:latest` image + - Uses `apache/iotdb:1.3.6-confignode` and `apache/iotdb:1.3.6-datanode` images - Bridge network configuration - Health checks for all services 2. **`docker-compose-3c3d.yml`** - Multi-node cluster setup - Services: 3 ConfigNodes + 3 DataNodes + test container + - Uses `apache/iotdb:1.3.6-confignode` and `apache/iotdb:1.3.6-datanode` images - Replication factors set to 3 - Sequential startup with dependencies - Multiple ports exposed (6667, 6668, 6669)
diff --git a/docker-compose-1c1d.yml b/docker-compose-1c1d.yml index 2ac8dbb..6734b16 100644 --- a/docker-compose-1c1d.yml +++ b/docker-compose-1c1d.yml
@@ -1,5 +1,3 @@ -version: '3.4' - services: iotdb-test: build: @@ -18,7 +16,7 @@ command: ["npm", "run", "test:e2e"] iotdb-datanode: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-datanode container_name: iotdb-datanode restart: always depends_on: @@ -40,10 +38,9 @@ - dn_seed_config_node=iotdb-confignode:10710 iotdb-confignode: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-confignode container_name: iotdb-confignode restart: always - command: ["bash", "-c", "entrypoint.sh confignode"] healthcheck: test: ["CMD", "ls", "/iotdb/data"] interval: 3s
diff --git a/docker-compose-3c3d.yml b/docker-compose-3c3d.yml index c062764..adb958b 100644 --- a/docker-compose-3c3d.yml +++ b/docker-compose-3c3d.yml
@@ -1,5 +1,3 @@ -version: '3.4' - services: iotdb-test: build: @@ -23,10 +21,9 @@ # ConfigNode 1 iotdb-confignode-1: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-confignode container_name: iotdb-confignode-1 restart: always - command: ["bash", "-c", "entrypoint.sh confignode"] healthcheck: test: ["CMD", "ls", "/iotdb/data"] interval: 3s @@ -44,10 +41,9 @@ # ConfigNode 2 iotdb-confignode-2: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-confignode container_name: iotdb-confignode-2 restart: always - command: ["bash", "-c", "entrypoint.sh confignode"] healthcheck: test: ["CMD", "ls", "/iotdb/data"] interval: 3s @@ -68,10 +64,9 @@ # ConfigNode 3 iotdb-confignode-3: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-confignode container_name: iotdb-confignode-3 restart: always - command: ["bash", "-c", "entrypoint.sh confignode"] healthcheck: test: ["CMD", "ls", "/iotdb/data"] interval: 3s @@ -94,7 +89,7 @@ # DataNode 1 iotdb-datanode-1: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-datanode container_name: iotdb-datanode-1 restart: always healthcheck: @@ -120,7 +115,7 @@ # DataNode 2 iotdb-datanode-2: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-datanode container_name: iotdb-datanode-2 restart: always healthcheck: @@ -148,7 +143,7 @@ # DataNode 3 iotdb-datanode-3: - image: apache/iotdb:latest + image: apache/iotdb:1.3.6-datanode container_name: iotdb-datanode-3 restart: always healthcheck: