fix actions (remove"-" from docker-compose)

moevm · Aug 27, 2024 · 3057424 · 3057424
1 parent 1389104
commit 3057424
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Build system images (non-pulling)
         run: |
@@ -16,10 +16,10 @@ jobs:
       - name: Build docker-compose
         run: |
           cp .env_example .env
-          docker-compose build
+          docker compose build
       - name: Run docker-compose
         run: |
-          docker-compose up -d
+          docker compose up -d
           sleep 10
       - name: Run tests
         run: |

diff --git a/.github/workflows/selenium_tests.yml b/.github/workflows/selenium_tests.yml
@@ -7,17 +7,17 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - name: Build docker-compose with docker-compose-selenium (tests)
+      - name: Build docker compose with docker-compose-selenium (tests)
         run: |
           cp .env_example .env
           cp app/VERSION_example.json app/VERSION.json
-          docker-compose -f docker-compose.yml -f docker-compose-selenium.yml build
+          docker compose -f docker-compose.yml -f docker-compose-selenium.yml build
       
       - name: Run docker-compose with docker-compose-selenium (tests)
         run: |
-          docker-compose -f docker-compose.yml -f docker-compose-selenium.yml up -d
+          docker compose -f docker-compose.yml -f docker-compose-selenium.yml up -d
           chmod +x tests/scripts/docker_check_tests.sh
           ./tests/scripts/docker_check_tests.sh
 

diff --git a/tests/scripts/docker_check_tests.sh b/tests/scripts/docker_check_tests.sh
@@ -1,7 +1,7 @@
 # !/bin/bash
 
 service="selenium-tests"
-container_id=$(docker-compose -f docker-compose.yml -f docker-compose-selenium.yml ps -q $service)
+container_id=$(docker compose -f docker-compose.yml -f docker-compose-selenium.yml ps -q $service)
 
 if [ -z "$container_id" ]; then
     echo "Контейнер сервиса $service не найден."
@@ -17,11 +17,11 @@ echo "tests are finished"
 
 EXIT_CODE=$(docker inspect "$container_id" --format='{{.State.ExitCode}}')
 echo "tests logs:"
-docker-compose -f docker-compose.yml -f docker-compose-selenium.yml logs selenium-tests
+docker compose -f docker-compose.yml -f docker-compose-selenium.yml logs selenium-tests
 echo "web logs:"
-docker-compose logs web
+docker compose logs web
 echo "worker logs:"
-docker-compose logs worker
+docker compose logs worker
 
 if [ "$EXIT_CODE" -eq 0 ]; then
     echo "tests finished with code $EXIT_CODE (OK)"