use healthchecks to wait for containers to be up

Issue: BB-496
scality · Feb 10, 2025 · c65da35 · c65da35
1 parent f1276c8
commit c65da35
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 34 deletions.
diff --git a/.github/dockerfiles/cloudserver/Dockerfile b/.github/dockerfiles/cloudserver/Dockerfile
@@ -0,0 +1,7 @@
+ARG CLOUDSERVER_IMAGE=ghcr.io/scality/cloudserver:7.70.47
+
+FROM ${CLOUDSERVER_IMAGE}
+
+ADD ./config.json /conf/config.json
+
+RUN apt update && apt install -y curl
diff --git a/...b/dockerfiles/e2e/cloudserver-config.json → .github/dockerfiles/cloudserver/config.json b/...b/dockerfiles/e2e/cloudserver-config.json → .github/dockerfiles/cloudserver/config.json
diff --git a/.github/dockerfiles/e2e/docker-compose.yaml b/.github/dockerfiles/e2e/docker-compose.yaml
@@ -7,6 +7,12 @@ services:
       - 8181
     user: 0:0
     privileged: true
+    healthcheck:
+      test: curl http://localhost:8181 || exit 1
+      interval: 10s
+      timeout: 30s
+      retries: 12
+      start_period: 10s
   metadata:
     profiles: ['s3c']
     image: ${METADATA_IMAGE}
@@ -17,10 +23,16 @@ services:
       SPROXYD: sproxyd:8181
     volumes:
         - ./metadata-config.json:/mnt/standalone_workdir/config.json:ro
+    healthcheck:
+      test: curl http://localhost:9000 || exit 1
+      interval: 10s
+      timeout: 30s
+      retries: 12
+      start_period: 10s
   cloudserver:
     profiles: ['s3c']
-    image: ${CLOUDSERVER_IMAGE}
-    network_mode: host
+    build:
+      context: ../cloudserver
     depends_on:
       - metadata
     environment:
@@ -31,8 +43,12 @@ services:
       S3_CONFIG_FILE: /conf/config.json
       REMOTE_MANAGEMENT_DISABLE: 1
     command: yarn start
-    volumes:
-      - ./cloudserver-config.json:/conf/config.json:ro
+    healthcheck:
+      test: curl http://localhost:8000 || exit 1
+      interval: 10s
+      timeout: 30s
+      retries: 12
+      start_period: 10s
   redis:
     profiles: ['s3c']
     image: ${REDIS_IMAGE}

diff --git a/.github/scripts/wait_for_local_port.bash b/.github/scripts/wait_for_local_port.bash
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -237,8 +237,7 @@ jobs:
           CLOUDSERVER_IMAGE: ghcr.io/scality/cloudserver:${{ matrix.cloudserver_tag }}
         run: |-
           set -e -o pipefail;
-          docker compose --profile ${{ matrix.profile }} up -d --quiet-pull
-          bash ../../scripts/wait_for_local_port.bash 8000 120
+          docker compose --profile ${{ matrix.profile }} up -d --quiet-pull --wait
         working-directory: .github/dockerfiles/e2e
       - name: Create Zookeeper paths for tests with metadata
         run: |-