From f037c44045481436d1b30c5f395b34b910a40782 Mon Sep 17 00:00:00 2001 From: mahula Date: Mon, 5 Aug 2024 09:46:29 +0200 Subject: [PATCH] use docker dompose instead of docker-compose in workflow files --- .github/workflows/test-backend.yml | 10 +++++----- .github/workflows/test-e2e.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index 44631c5e9..fbc2aab5b 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -111,17 +111,17 @@ jobs: cp frontend/.env.dist frontend/.env cp backend/.env.template backend/.env - - name: backend | docker-compose - run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend + - name: backend | docker compose + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps neo4j backend - name: backend | Initialize Database - run: docker-compose exec -T backend yarn db:migrate init + run: docker compose exec -T backend yarn db:migrate init - name: backend | Migrate Database Up - run: docker-compose exec -T backend yarn db:migrate up + run: docker compose exec -T backend yarn db:migrate up - name: backend | Unit test incl. coverage check - run: docker-compose exec -T backend yarn test + run: docker compose exec -T backend yarn test cleanup: name: Cleanup diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 40df1ec58..111cc3172 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -70,14 +70,14 @@ jobs: key: ${{ github.run_id }}-e2e-preparation-cache fail-on-cache-miss: true - - name: Boot up test system | docker-compose + - name: Boot up test system | docker compose run: | chmod +x /opt/cucumber-json-formatter sudo ln -fs /opt/cucumber-json-formatter /usr/bin/cucumber-json-formatter docker load < /tmp/images/neo4j.tar docker load < /tmp/images/backend.tar docker load < /tmp/images/webapp.tar - docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend + docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps webapp neo4j backend sleep 90s - name: Full stack tests | run tests