Merge pull request ClickHouse#87940 from ClickHouse/backport/25.8/87897

Author: fm4v

tests/integration/compose/docker_compose_iceberg_lakekeeper_catalog.yml

@@ -7,22 +7,21 @@ services:
       - LAKEKEEPER__PG_DATABASE_URL_WRITE=postgresql://postgres:postgres@db:5432/postgres
       - RUST_LOG=info
     command: ["serve"]
+    ports:
+      - 8181:8181
     healthcheck:
       test: ["CMD", "/home/nonroot/lakekeeper", "healthcheck"]
       interval: 1s
       timeout: 10s
       retries: 10
       start_period: 30s
     depends_on:
+      mc:
+        condition: service_completed_successfully
       migrate:
         condition: service_completed_successfully
       db:
         condition: service_healthy
-      minio:
-        condition: service_healthy
-    ports:
-      - 8181:8181
-
 
   migrate:
     image: vakamo/lakekeeper:v0.9.4
@@ -37,15 +36,14 @@ services:
       db:
         condition: service_healthy
 
-
   bootstrap:
     image: curlimages/curl
     depends_on:
       lakekeeper:
         condition: service_healthy
     restart: "no"
     command:
-      - -w
+      - "-w"
       - "%{http_code}"
       - "-X"
       - "POST"
@@ -58,47 +56,45 @@ services:
       - "-o"
       - "/dev/null"
 
-
-
-
-
-
   db:
-    image: bitnami/postgresql:16.3.0
+    image: postgres:16
     environment:
-      - POSTGRESQL_USERNAME=postgres
-      - POSTGRESQL_PASSWORD=postgres
-      - POSTGRESQL_DATABASE=postgres
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DB=postgres
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -p 5432 -d postgres"]
+      test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
       interval: 2s
       timeout: 10s
       retries: 5
       start_period: 10s
 
-  # TODO: can we simply use with_minio=True instead?
   minio:
-    image: bitnami/minio:2025.4.22
+    image: minio/minio:RELEASE.2024-07-31T05-46-26Z
     environment:
       - MINIO_ROOT_USER=minio
       - MINIO_ROOT_PASSWORD=ClickHouse_Minio_P@ssw0rd
-      - MINIO_API_PORT_NUMBER=9000
-      - MINIO_CONSOLE_PORT_NUMBER=9001
       - MINIO_SCHEME=http
       - MINIO_DEFAULT_BUCKETS=warehouse-rest
-    networks: 
+    networks:
       default:
         aliases:
           - warehouse-rest.minio
-    ports:
-      - "9002:9000"
-      - "9003:9001"
-    healthcheck:
-      test: ["CMD", "mc", "ls", "local", "|", "grep", "warehouse-rest"]
-      interval: 2s
-      timeout: 10s
-      retries: 3
-      start_period: 15s
-
-
+    command: ["server", "/data", "--console-address", ":9001"]
 
+  mc:
+    depends_on:
+      - minio
+    image: minio/mc:RELEASE.2025-04-16T18-13-26Z
+    environment:
+      - AWS_ACCESS_KEY_ID=minio
+      - AWS_SECRET_ACCESS_KEY=ClickHouse_Minio_P@ssw0rd
+      - AWS_REGION=us-east-1
+    restart: "no"
+    entrypoint: >
+      /bin/sh -c "
+      until (/usr/bin/mc config host add minio http://minio:9000 minio ClickHouse_Minio_P@ssw0rd) do echo '...waiting...' && sleep 1; done;
+      /usr/bin/mc rm -r --force minio/warehouse-rest;
+      /usr/bin/mc mb minio/warehouse-rest --ignore-existing;
+      /usr/bin/mc policy set public minio/warehouse-rest;
+      " # FIX 3: Removed 'tail -f /dev/null' to make this a one-shot setup task.

tests/integration/compose/docker_compose_ldap.yml

@@ -1,6 +1,6 @@
 services:
     openldap:
-        image: bitnami/openldap:2.6.8
+        image: bitnamilegacy/openldap:2.6.8
         stop_grace_period: 5s
         restart: always
         environment: