#129: Usage of V2 docker compose

Author: HolgerSantelmann

.github/workflows/playwright-tests.yml

@@ -23,6 +23,7 @@ env:
   SOLUTION_PATH: source/AAS.TwinEngine.DataEngine.sln
   PLAYWRIGHT_TEST_PROJECT: source/AAS.TwinEngine.Plugin.TestPlugin.PlaywrightTests/AAS.TwinEngine.Plugin.TestPlugin.PlaywrightTests.csproj
   DOCKER_COMPOSE_PATH: source/AAS.TwinEngine.Plugin.TestPlugin/Example
+  BASE_URL: "http://localhost:8085"
 
 jobs:
   playwright-tests:
@@ -74,7 +75,7 @@ jobs:
       - name: Start Docker Compose services
         run: |
           cd ${{ env.DOCKER_COMPOSE_PATH }}
-          docker-compose up -d
+          docker compose up -d
         env:
           COMPOSE_HTTP_TIMEOUT: 200
 
@@ -90,17 +91,17 @@ jobs:
           
           while [ $ELAPSED -lt $MAX_WAIT ]; do
             # Check if all services are running
-            RUNNING=$(docker-compose ps --status running --format json 2>/dev/null | jq -s 'length' 2>/dev/null || echo "0")
-            TOTAL=$(docker-compose ps --format json 2>/dev/null | jq -s 'length' 2>/dev/null || echo "0")
+            RUNNING=$(docker compose ps --status running --format json 2>/dev/null | jq -s 'length' 2>/dev/null || echo "0")
+            TOTAL=$(docker compose ps --format json 2>/dev/null | jq -s 'length' 2>/dev/null || echo "0")
             
             echo "Running containers: $RUNNING/$TOTAL"
             
             # Check for any unhealthy services
-            UNHEALTHY=$(docker-compose ps --format json 2>/dev/null | jq -r 'select(.Health != "" and .Health != "healthy") | .Service' 2>/dev/null | wc -l)
+            UNHEALTHY=$(docker compose ps --format json 2>/dev/null | jq -r 'select(.Health != "" and .Health != "healthy") | .Service' 2>/dev/null | wc -l)
             
             if [ $RUNNING -ge 6 ] && [ $UNHEALTHY -eq 0 ]; then
               echo "Services are up and running!"
-              docker-compose ps
+              docker compose ps
               break
             fi
             
@@ -112,9 +113,9 @@ jobs:
           if [ $ELAPSED -ge $MAX_WAIT ]; then
             echo "Timeout waiting for services to be ready"
             echo "Current service status:"
-            docker-compose ps
+            docker compose ps
             echo "Service logs:"
-            docker-compose logs --tail=100
+            docker compose logs --tail=100
             exit 1
           fi
           
@@ -125,13 +126,13 @@ jobs:
           # Verify critical endpoints are responding
           echo "Checking DataEngine endpoint..."
           for i in {1..15}; do
-            if curl -f -s -o /dev/null http://localhost:8085/shells 2>&1; then
+            if curl -f -s -o /dev/null ${{ env.BASE_URL }}/shells 2>&1; then
               echo "DataEngine is responding!"
               break
             fi
             if [ $i -eq 15 ]; then
               echo "DataEngine is not responding after 15 attempts"
-              docker-compose logs twinengine-dataengine --tail=50
+              docker compose logs twinengine-dataengine --tail=50
               exit 1
             fi
             echo "Attempt $i: DataEngine not ready yet..."
@@ -144,14 +145,14 @@ jobs:
         if: always()
         run: |
           cd ${{ env.DOCKER_COMPOSE_PATH }}
-          docker-compose ps
+          docker compose ps
           echo "---"
-          docker-compose logs --tail=50
+          docker compose logs --tail=50
 
       - name: Run Playwright Tests
         run: dotnet test ${{ env.PLAYWRIGHT_TEST_PROJECT }} --configuration ${{ env.BUILD_CONFIGURATION }} --no-build --logger "trx;LogFileName=playwright_test_results.trx" --verbosity normal
         env:
-          BASE_URL: http://localhost:8085
+          BASE_URL: ${{ env.BASE_URL }}
 
       - name: Publish Test Results
         uses: dorny/test-reporter@fe45e9537387dac839af0d33ba56eed8e24189e8 # v2.3.0
@@ -177,8 +178,8 @@ jobs:
         run: |
           cd ${{ env.DOCKER_COMPOSE_PATH }}
           mkdir -p logs
-          docker-compose logs > logs/docker-compose-full.log 2>&1 || true
-          docker-compose ps > logs/docker-compose-status.txt 2>&1 || true
+          docker compose logs > logs/docker-compose-full.log 2>&1 || true
+          docker compose ps > logs/docker-compose-status.txt 2>&1 || true
 
 #       - name: Upload Docker Compose Logs
 #         if: always()
@@ -192,4 +193,4 @@ jobs:
         if: always()
         run: |
           cd ${{ env.DOCKER_COMPOSE_PATH }}
-          docker-compose down -v
+          docker compose down -v