From fb0f901472d515b067190a239b9513940dea4357 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Tue, 12 Nov 2024 19:55:14 +0100 Subject: [PATCH] call frontend docker before waiting 10 seconds, use build instead of dev to prevent timeout --- .github/workflows/test_e2e.yml | 6 +++--- frontend/Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_e2e.yml b/.github/workflows/test_e2e.yml index 590758248..bdf979bf9 100644 --- a/.github/workflows/test_e2e.yml +++ b/.github/workflows/test_e2e.yml @@ -23,6 +23,9 @@ jobs: cd .. docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps backend + - name: Boot up test system | docker-compose frontends + run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx + - name: Sleep for 10 seconds run: sleep 10s @@ -34,9 +37,6 @@ jobs: cd ../backend yarn && yarn seed - - name: Boot up test system | docker-compose frontends - run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps frontend admin nginx - - name: Boot up test system | docker-compose mailserver run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mailserver diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 6f6cc0e9e..6acd4f268 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -75,8 +75,10 @@ FROM build as test # Install Additional Software RUN apk add --no-cache bash jq +RUN yarn run build + # Run command -CMD /bin/sh -c "yarn run dev" +CMD /bin/sh -c "yarn run start" ################################################################################## # PRODUCTION (Does contain only "binary"- and static-files to reduce image size) #