Drop auxiliary *wait services in docker compose, use --wait instead.

Author: chenkins

README.md

@@ -21,7 +21,7 @@ Features:
 ## One-Stop Shop Demo with Docker Compose
 
 ```bash
-docker compose -f hub/src/test/resources/docker-compose-minio-localhost-hub.yml --profile local up -d
+docker compose -f hub/src/test/resources/docker-compose-minio-localhost-hub.yml --profile local up --wait
 docker compose -f hub/src/test/resources/docker-compose-minio-localhost-hub.yml --profile local down
 ```
 

hub/src/test/java/cloud/katta/testsetup/HubTestSetupDockerExtension.java

@@ -61,9 +61,8 @@ protected void setupDocker(final HubTestConfig.Setup.DockerConfig configuration)
                 .withPull(true)
                 .withEnv(env)
                 .withOptions(configuration.profile == null ? "" : String.format("--profile=%s", configuration.profile))
-                .waitingFor("wait-1", new LogMessageWaitStrategy().withRegEx(".*exit 0.*").withStartupTimeout(Duration.ofMinutes(2)));
+                .waitingFor("minio_setup-1", new LogMessageWaitStrategy().withRegEx(".*Completed MinIO Setup.*").withStartupTimeout(Duration.ofMinutes(2)));
         compose.start();
-
         log.info("Done setup docker {}", configuration);
     }
 

hub/src/test/resources/docker-compose-minio-localhost-hub.yml

@@ -395,37 +395,4 @@ services:
         curl -v --fail http://localhost:${HUB_PORT}/api/storageprofile/ -H "Authorization: Bearer $$ACCESS_TOKEN"
         echo "createbuckets successful"
 
-  wait-demo: # force `docker compose up -d` to wait for and check for the conditions below:
-    profiles: [ demo ]
-    image: busybox
-    depends_on:
-      minio_setup:
-        condition: service_completed_successfully
-      hub_setup_storage_profile:
-        condition: service_completed_successfully
-    entrypoint: [ "sh","-c" ]
-    command:
-      - |
-        set -euxo pipefail
-        exit 0
-    healthcheck:
-      test: [ "CMD-SHELL", "exit 0" ]
-      interval: 10s
-      timeout: 1s
-      retries: 30
 
-  wait: # force `docker compose up -d` to wait for and check for the conditions below:
-    image: busybox
-    depends_on:
-      minio_setup:
-        condition: service_completed_successfully
-    entrypoint: [ "sh","-c" ]
-    command:
-      - |
-        set -euxo pipefail
-        exit 0
-    healthcheck:
-      test: [ "CMD-SHELL", "exit 0" ]
-      interval: 10s
-      timeout: 1s
-      retries: 30