diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 24a6157..bc03a8b 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -58,14 +58,7 @@ jobs: e2e: name: E2E browser tests runs-on: ubuntu-latest - services: - dind: - image: docker:28-dind - options: --privileged - env: - DOCKER_TLS_CERTDIR: "" env: - DOCKER_HOST: tcp://dind:2375 POSTGRES_DB: bilhej POSTGRES_USER: bilhej POSTGRES_PASSWORD: test_pw_ci_123 diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index 6d23789..6dfd8b4 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -1,3 +1,7 @@ +networks: + e2e: + driver: bridge + services: postgres: image: postgres:16 @@ -6,6 +10,8 @@ services: POSTGRES_DB: ${POSTGRES_DB} POSTGRES_USER: ${POSTGRES_USER} POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + networks: + - e2e healthcheck: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] interval: 5s @@ -26,6 +32,8 @@ services: STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY} STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET} STRIPE_PRICE_ID: ${STRIPE_PRICE_ID} + networks: + - e2e depends_on: postgres: condition: service_healthy @@ -35,6 +43,8 @@ services: dockerfile: docker/frontend.e2e.Dockerfile context: . container_name: bilhej-frontend-e2e + networks: + - e2e depends_on: - backend @@ -46,6 +56,8 @@ services: ipc: host environment: PLAYWRIGHT_BASE_URL: http://frontend + networks: + - e2e depends_on: - frontend command: >-