Refactor Docker Compose usage in CI

actris-cloudnet · Aug 22, 2023 · 22c2eec · 22c2eec
1 parent dd5ebd4
commit 22c2eec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 31 deletions.
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
@@ -57,29 +57,6 @@ services:
     volumes:
       - ../frontend:/app
       - ../shared:/shared
-  test-backend:
-    image: backend
-    depends_on:
-      backend:
-        condition: service_healthy
-    env_file:
-      - ci.env
-    command: ["npm", "test"]
-  e2e-test-backend:
-    image: backend
-    depends_on:
-      backend:
-        condition: service_healthy
-    env_file:
-      - ci.env
-    command: ["npm", "run", "e2e-test"]
-  lint-backend:
-    image: backend
-    depends_on:
-      - backend
-    env_file:
-      - ci.env
-    command: ["npm", "run", "lint"]
   selenium:
     image: selenium/standalone-firefox:4.0.0-beta-1-20210215
     shm_size: 2g

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,17 +25,17 @@ jobs:
           load: true
 
       - name: Lint
-        run: docker-compose run lint-backend
+        run: docker compose run backend npm run lint
 
       - name: Run unit and integration tests
-        run: docker-compose run test-backend
+        run: docker compose run backend npm test
 
       - name: Run e2e tests
-        run: docker-compose run e2e-test-backend
+        run: docker compose run backend npm run e2e-test
 
       - name: Print logs
         if: always()
-        run: docker-compose logs
+        run: docker compose logs
 
   frontend:
     name: Frontend
@@ -59,15 +59,15 @@ jobs:
 
       - name: Install dependencies
         run: |
-          docker-compose run frontend npm install
+          docker compose run frontend npm install
           docker compose run frontend sh -c 'cd /shared && npm install'
 
       - name: Lint frontend
-        run: docker-compose run frontend npm run lint
+        run: docker compose run frontend npm run lint
 
       - name: Run unit tests
-        run: docker-compose run frontend npm run test:unit
+        run: docker compose run frontend npm run test:unit
 
       - name: Print logs
         if: always()
-        run: docker-compose logs
+        run: docker compose logs