diff --git a/.github/workflows/impress-frontend.yml b/.github/workflows/impress-frontend.yml index 32dd72b4..eb463aba 100644 --- a/.github/workflows/impress-frontend.yml +++ b/.github/workflows/impress-frontend.yml @@ -149,6 +149,10 @@ jobs: run: | make run + - name: Start Nginx for the frontend + run: | + docker compose up --force-recreate -d nginx-front + - name: Apply DRF migrations run: | make migrate @@ -223,6 +227,10 @@ jobs: run: | make run + - name: Start Nginx for the frontend + run: | + docker compose up --force-recreate -d nginx-front + - name: Apply DRF migrations run: | make migrate diff --git a/docker-compose.yml b/docker-compose.yml index 7a1ee916..f01b48d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -121,6 +121,14 @@ services: depends_on: - keycloak + nginx-front: + image: nginx:1.25 + ports: + - "3000:3000" + volumes: + - ./src/frontend/apps/impress/conf/default.conf:/etc/nginx/conf.d/default.conf + - ./src/frontend/apps/impress/out:/usr/share/nginx/html + dockerize: image: jwilder/dockerize diff --git a/src/frontend/apps/e2e/playwright.config.ts b/src/frontend/apps/e2e/playwright.config.ts index 08caf07f..401433c1 100644 --- a/src/frontend/apps/e2e/playwright.config.ts +++ b/src/frontend/apps/e2e/playwright.config.ts @@ -32,12 +32,10 @@ export default defineConfig({ }, webServer: { - command: `cd ../.. && yarn app:${ - process.env.CI ? 'start -p ' : 'dev --port ' - } ${PORT}`, + command: !process.env.CI ? `cd ../.. && yarn app:dev --port ${PORT}` : '', url: baseURL, timeout: 120 * 1000, - reuseExistingServer: !process.env.CI, + reuseExistingServer: true, }, /* Configure projects for major browsers */ diff --git a/src/frontend/apps/impress/conf/default.conf b/src/frontend/apps/impress/conf/default.conf index cb639442..684bf17b 100644 --- a/src/frontend/apps/impress/conf/default.conf +++ b/src/frontend/apps/impress/conf/default.conf @@ -1,5 +1,6 @@ server { listen 8080; + listen 3000; server_name localhost; root /usr/share/nginx/html;