From 0007d89565ae973cb4e735c8962816a6196d51a8 Mon Sep 17 00:00:00 2001 From: Jon Kafton <939376+jonkafton@users.noreply.github.com> Date: Mon, 5 Feb 2024 20:46:43 +0100 Subject: [PATCH] Compose file for all commands --- .env.ci | 1 + .github/workflows/e2e-testing.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.env.ci b/.env.ci index 8096b6c4b4..8671a27272 100644 --- a/.env.ci +++ b/.env.ci @@ -11,6 +11,7 @@ CELERY_BROKER_URL=redis://redis:6379/4 CELERY_RESULT_BACKEND=redis://redis:6379/4 TIKA_CLIENT_ONLY=True MITOPEN_BASE_URL=http://localhost:8063/ +MITOPEN_HOSTNAME=localhost:8063 MAILGUN_KEY=fake_mailgun_key MAILGUN_SENDER_DOMAIN=other.fake.site OPENSEARCH_INDEX=testindex diff --git a/.github/workflows/e2e-testing.yml b/.github/workflows/e2e-testing.yml index dbfa0763d5..616579f017 100644 --- a/.github/workflows/e2e-testing.yml +++ b/.github/workflows/e2e-testing.yml @@ -16,12 +16,12 @@ jobs: run: yarn install --immutable - name: Build frontend - run: yarn run build + run: yarn build - name: Run services and E2E tests run: | docker compose -f docker-compose-e2e-tests.yml up nginx web db --detach --wait - docker compose cp e2e_testing/fixtures/002_carousel.sql db:/002_carousel.sql - docker compose exec -u postgres db psql postgres postgres -f /002_carousel.sql + docker compose -f docker-compose-e2e-tests.yml cp e2e_testing/fixtures/002_carousel.sql db:/002_carousel.sql + docker compose -f docker-compose-e2e-tests.yml exec -u postgres db psql postgres postgres -f /002_carousel.sql docker compose -f docker-compose-e2e-tests.yml run e2e-tests - docker compose down + docker compose -f docker-compose-e2e-tests.yml down