update

Change-Id: I021b823247a51100686092adaccf995cc9eec806
apache · Jan 22, 2025 · 2c35dce · 2c35dce
1 parent bce7d1d
commit 2c35dce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/docker/thirdparties/docker-compose/iceberg/entrypoint.sh.tpl b/docker/thirdparties/docker-compose/iceberg/entrypoint.sh.tpl
@@ -18,6 +18,13 @@
 
 export SPARK_MASTER_HOST=doris--spark-iceberg
 
+# wait iceberg-rest start
+if [[ -n $(curl -s --fail http://rest:8181/v1/config) ]]; then
+    sleep 1
+fi
+
+set -ex
+
 start-master.sh -p 7077
 start-worker.sh spark://doris--spark-iceberg:7077
 start-history-server.sh

diff --git a/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl b/docker/thirdparties/docker-compose/iceberg/iceberg.yaml.tpl
@@ -41,11 +41,11 @@ services:
       - AWS_ACCESS_KEY_ID=admin
       - AWS_SECRET_ACCESS_KEY=password
       - AWS_REGION=us-east-1
-    entrypoint: /bin/sh /mnt/scripts/entrypoint.sh 
+    entrypoint: /bin/sh /mnt/scripts/entrypoint.sh
     networks:
       - doris--iceberg
     healthcheck:
-      test: ["CMD", "ls", "/mnt/SUCCESS"]
+      test: ls /mnt/SUCCESS
       interval: 5s
       timeout: 120s
       retries: 120
@@ -94,15 +94,15 @@ services:
     entrypoint: /bin/bash /mnt/data/input/script/rest_init.sh
 
   minio:
-    image: minio/minio
+    image: minio/minio:RELEASE.2025-01-20T14-49-07Z
     container_name: doris--minio
     ports:
       - ${MINIO_API_PORT}:9000
     healthcheck:
       test: [ "CMD", "mc", "ready", "local" ]
       interval: 10s
       timeout: 60s
-      retries: 10
+      retries: 120
     environment:
       - MINIO_ROOT_USER=admin
       - MINIO_ROOT_PASSWORD=password
@@ -117,7 +117,7 @@ services:
     depends_on:
       minio:
         condition: service_healthy
-    image: minio/mc
+    image: minio/mc:RELEASE.2025-01-17T23-25-50Z
     container_name: doris--mc
     environment:
       - AWS_ACCESS_KEY_ID=admin