Updated github actions to use docker compose instead of docker-compose

CVEProject · Aug 5, 2024 · fcc7fc4 · fcc7fc4
1 parent 5985bc2
commit fcc7fc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/test-http.yml b/.github/workflows/test-http.yml
@@ -14,30 +14,30 @@ jobs:
     - name: Build and Run Services and Mongo Containers
       run: |
         cp docker/.docker-env.example docker/.docker-env
-        docker-compose --file docker/docker-compose.yml build
-        docker-compose --file docker/docker-compose.yml up -d
+        docker compose --file docker/docker-compose.yml build
+        docker compose --file docker/docker-compose.yml up -d
     - name: Build Test Container
       run: |
         cp test-http/docker/.docker-env.example test-http/docker/.docker-env
-        docker-compose --file test-http/docker/docker-compose.yml build
+        docker compose --file test-http/docker/docker-compose.yml build
     - name: Run Test Container
       run: |
-        docker-compose --file test-http/docker/docker-compose.yml up -d
+        docker compose --file test-http/docker/docker-compose.yml up -d
     - name: Sleep
       run: bash -c "while ! docker-compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
     - name: Load Data into MongoDb
-      run: docker-compose -f docker/docker-compose.yml exec -T cveawg npm run populate:dev y
+      run: docker compose -f docker/docker-compose.yml exec -T cveawg npm run populate:dev y
     - name: Run Black Box Tests
       run: |
-        docker-compose --file test-http/docker/docker-compose.yml exec -T demon pytest src/ | tee test-http/src/testOutput.txt
+        docker compose --file test-http/docker/docker-compose.yml exec -T demon pytest src/ | tee test-http/src/testOutput.txt
     - name: Archive Test Results
       uses: actions/upload-artifact@v2
       with:
         name: test-results
         path: test-http/src/testOutput.txt
         retention-days: 1
     - name: Extract Tests Results
-      run: docker-compose --file test-http/docker/docker-compose.yml exec -T demon /bin/bash src/parse_tests_output.sh | (read foo; echo "##[set-output name=result;]$(echo $foo)")
+      run: docker compose --file test-http/docker/docker-compose.yml exec -T demon /bin/bash src/parse_tests_output.sh | (read foo; echo "##[set-output name=result;]$(echo $foo)")
       id: tests_result
     - name: Evaluate Tests Results
       if: ${{ steps.tests_result.outputs.result == 'Tests failed' }}

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -14,10 +14,10 @@ jobs:
     - name: Build and Run Services and Mongo Containers
       run: |
         cp docker/.docker-env.test-example docker/.docker-env
-        docker-compose --file docker/docker-compose.yml build
-        docker-compose --file docker/docker-compose.yml up -d
+        docker compose --file docker/docker-compose.yml build
+        docker compose --file docker/docker-compose.yml up -d
     - name: Sleep
       run: bash -c "while ! docker-compose --file docker/docker-compose.yml logs --tail=10 cveawg | grep -q 'Serving on port'; do sleep 1; done"
     - name: Run Tests
-      run: docker-compose -f docker/docker-compose.yml exec -T cveawg npm run test:integration
+      run: docker compose -f docker/docker-compose.yml exec -T cveawg npm run test:integration
       continue-on-error: false