diff --git a/.github/workflows/e2e_docker.yml b/.github/workflows/e2e_docker.yml index 1a60770..ccd321b 100644 --- a/.github/workflows/e2e_docker.yml +++ b/.github/workflows/e2e_docker.yml @@ -35,7 +35,7 @@ jobs: - name: Run e2e tests run: | - docker-compose -f docker-compose.yml --profile synpress up --build --exit-code-from synpress + docker-compose -f tests/e2e/docker-compose.yml --profile synpress up --build --exit-code-from synpress env: COMPOSE_DOCKER_CLI_BUILD: 1 DOCKER_BUILDKIT: 1 diff --git a/Dockerfile b/Dockerfile index 9e515ed..55c1d76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app RUN apt update && apt install -y nginx -COPY nginx.conf /etc/nginx/sites-available/default +COPY tests/e2e/nginx.conf /etc/nginx/sites-available/default COPY . . diff --git a/docker-compose.yml b/tests/e2e/docker-compose.yml similarity index 99% rename from docker-compose.yml rename to tests/e2e/docker-compose.yml index 1657a78..7d3e2ef 100644 --- a/docker-compose.yml +++ b/tests/e2e/docker-compose.yml @@ -5,7 +5,7 @@ services: profiles: - synpress container_name: synpress - build: . + build: ../.. environment: - DISPLAY=display:0.0 - CYPRESS_PRIVATE_KEY_WITH_FUNDS=${CYPRESS_PRIVATE_KEY_WITH_FUNDS} diff --git a/nginx.conf b/tests/e2e/nginx.conf similarity index 100% rename from nginx.conf rename to tests/e2e/nginx.conf