switch testflows from docker-compose to docker compose, continue debug

Altinity · Aug 1, 2024 · 5c27caa · 5c27caa
1 parent 5f3a379
commit 5c27caa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml
@@ -23,14 +23,13 @@ services:
     image: docker.io/bitnami/minio:${MINIO_VERSION:-latest}
     hostname: minio
     environment:
-      MINIO_ACCESS_KEY: access_key
-      MINIO_SECRET_KEY: it_is_my_super_secret_key
       MINIO_DEFAULT_BUCKETS: 'clickhouse'
       MINIO_ROOT_USER: access_key
       MINIO_ROOT_PASSWORD: it_is_my_super_secret_key
       MINIO_SCHEME: https
+      BITNAMI_DEBUG: "true"
     healthcheck:
-      test: curl -skL https://localhost:9000/ && ls -la /bitnami/minio/data/clickhouse/
+      test: ls -la /bitnami/minio/data/clickhouse/ && curl -skL https://localhost:9000/
       interval: 1s
       retries: 60
     volumes:

diff --git a/test/integration/docker-compose_advanced.yml b/test/integration/docker-compose_advanced.yml
@@ -32,14 +32,13 @@ services:
     image: docker.io/bitnami/minio:${MINIO_VERSION:-latest}
     hostname: minio
     environment:
-      MINIO_ACCESS_KEY: access_key
-      MINIO_SECRET_KEY: it_is_my_super_secret_key
       MINIO_DEFAULT_BUCKETS: 'clickhouse'
       MINIO_ROOT_USER: access_key
       MINIO_ROOT_PASSWORD: it_is_my_super_secret_key
       MINIO_SCHEME: https
+      BITNAMI_DEBUG: "true"
     healthcheck:
-      test: curl -skL https://localhost:9000/ && ls -la /bitnami/minio/data/clickhouse/
+      test: ls -la /bitnami/minio/data/clickhouse/ && curl -skL https://localhost:9000/
       interval: 1s
       retries: 60
     volumes:

diff --git a/test/testflows/clickhouse_backup/docker-compose/docker-compose.yml b/test/testflows/clickhouse_backup/docker-compose/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   zookeeper:
     # @TODO back :latest default value after resolve https://github.com/ClickHouse/ClickHouse/issues/53749
@@ -168,7 +166,7 @@ services:
       start_period: 10s
 
   sftp_server:
-    image: panubo/sshd:1.5.0
+    image: panubo/sshd:latest
     hostname: sftp_server
     environment:
       SSH_ENABLE_ROOT: "true"