Maintenance: Adapt docker test invocation

.github/workflows/docker-ci.yaml

@@ -52,6 +52,9 @@ jobs:
           VERSION=latest
           ENV_FILE
 
-          docker compose -f docker-compose.yml up --detach
-          docker compose cp .github/auto_wizard.json zammad-railsserver:/opt/zammad/tmp
-          .github/tests.sh
+          .github/tests/setup/default.sh
+          .github/tests/default.sh
+
+          docker compose ps
+          # Ensure we are running with the correct image
+          docker compose ps | grep zammad-local:latest

.gitlab/ci/test/docker.yml

@@ -33,10 +33,12 @@ docker:
         ports: !reset []
     COMPOSE_OVERRIDE_FILE
 
-    docker compose up --quiet-pull --detach
-    docker compose cp .github/auto_wizard.json zammad-railsserver:/opt/zammad/tmp
-    DISABLE_EXTERNAL_TESTS=1 .github/tests.sh
+    .github/tests/setup/default.sh
+    DISABLE_EXTERNAL_TESTS=1 .github/tests/default.sh
+
     docker compose ps
+    # Ensure we are running with the correct image
+    docker compose ps | grep ${ZAMMAD_IMAGE}
   after_script:
     - cd zammad-docker-compose
     - docker compose down --timeout 0 --volumes

contrib/docker/docker-entrypoint.sh

@@ -87,7 +87,7 @@ if [ "$1" = 'zammad-init' ]; then
     fi
 
     until (echo > /dev/tcp/"${ELASTICSEARCH_HOST}/${ELASTICSEARCH_PORT}") &> /dev/null; do
-      echo "zammad railsserver waiting for elasticsearch server to be ready..."
+      echo "zammad-init waiting for elasticsearch server to be ready…"
       sleep 1
     done