refactor: moved docker-compose and nginx.conf

Agoric · Mar 15, 2024 · f7ea905 · f7ea905
1 parent 16f070b
commit f7ea905
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 → tests/e2e/docker-compose.yml b/docker-compose.yml → 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 → tests/e2e/nginx.conf b/nginx.conf → tests/e2e/nginx.conf