Test nginx

Synthetixio · Aug 16, 2023 · b886b8d · b886b8d
1 parent 8c6a4a0
commit b886b8d
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 12 deletions.
diff --git a/.github/workflows/disabled/e2e_headless.yml b/.github/workflows/disabled/e2e_headless.yml
@@ -27,7 +27,7 @@ jobs:
 
  - name: Run anvil
  run: |
- docker-compose -f docker-compose.ci.yml --profile foundry up --build --detach
+ docker-compose -f docker-compose.ci.yml --profile foundry --profile foundry-metamask-test-dapp up --build --detach
  env:
  ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
 

diff --git a/.github/workflows/e2e_cypress-action.yml b/.github/workflows/e2e_cypress-action.yml
@@ -32,7 +32,7 @@ jobs:
 
  - name: Run anvil
  run: |
- docker-compose -f docker-compose.ci.yml --profile foundry up --build --detach
+ docker-compose -f docker-compose.ci.yml --profile foundry --profile foundry-metamask-test-dapp up --build --detach
  env:
  ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
 

diff --git a/.github/workflows/e2e_debug.yml b/.github/workflows/e2e_debug.yml
@@ -32,7 +32,7 @@ jobs:
 
  - name: Run anvil
  run: |
- docker-compose -f docker-compose.ci.yml --profile foundry up --build --detach
+ docker-compose -f docker-compose.ci.yml --profile foundry --profile foundry-metamask-test-dapp up --build --detach
  env:
  ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
 

diff --git a/.github/workflows/e2e_docker.yml b/.github/workflows/e2e_docker.yml
@@ -41,7 +41,7 @@ jobs:
 
  - name: Run e2e tests (${{ matrix.resolution }} res)
  run: |
- docker-compose -f docker-compose.ci.yml --env-file ${{ matrix.resolution }}-res.env --profile synpress --profile foundry up --build --exit-code-from synpress
+ docker-compose -f docker-compose.ci.yml --env-file ${{ matrix.resolution }}-res.env --profile synpress --profile foundry --profile foundry-metamask-test-dapp up --build --exit-code-from synpress
  env:
  COMPOSE_DOCKER_CLI_BUILD: 1
  DOCKER_BUILDKIT: 1

diff --git a/.github/workflows/e2e_headful.yml b/.github/workflows/e2e_headful.yml
@@ -32,7 +32,7 @@ jobs:
 
  - name: Run anvil
  run: |
- docker-compose -f docker-compose.ci.yml --profile foundry up --build --detach
+ docker-compose -f docker-compose.ci.yml --profile foundry --profile foundry-metamask-test-dapp up --build --detach
  env:
  ANVIL_FORK_URL: ${{ secrets.ANVIL_FORK_URL }}
 

diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,10 @@ FROM --platform=linux/amd64 synthetixio/docker-e2e:18.16-ubuntu as base
 RUN mkdir /app
 WORKDIR /app
 
+RUN apt update && apt install -y nginx
+
+COPY nginx.conf /etc/nginx/sites-available/default
+
 COPY package.json ./
 COPY pnpm-lock.yaml ./
 

diff --git a/README.md b/README.md
@@ -371,12 +371,12 @@ Docker is awesome for CI. Give it a try.
 2. `cd synpress`
 3. (optional) Fill env vars inside `.env` file
 4. (with foundry; preferred)
- `docker-compose --profile synpress --profile foundry up --build --exit-code-from synpress`
+ `docker-compose --profile synpress --profile foundry --profile foundry-metamask-test-dapp up --build --exit-code-from synpress`
  or `./start-tests.sh`
  - (without foundry)
  `docker-compose up --profile synpress --build --exit-code-from synpress`
 5. (with foundry and ngrok)
- `docker-compose --profile synpress --profile foundry --profile ngrok up --build --exit-code-from synpress`
+ `docker-compose --profile synpress --profile foundry --profile foundry-metamask-test-dapp --profile ngrok up --build --exit-code-from synpress`
 
 All examples of setup are present in this repository. Just take a look around.
 

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -43,7 +43,7 @@ services:
  - ./docker/videos:/app/tests/e2e/videos
  - ./docker/screenshots:/app/tests/e2e/screenshots
  command: >
- bash -c 'echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && pnpm test:e2e:ci:anvil'
+ bash -c 'echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && nginx && pnpm test:e2e:ci:anvil'
  networks:
  - x11
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
  - ./docker/videos:/app/tests/e2e/videos
  - ./docker/screenshots:/app/tests/e2e/screenshots
  command: >
- bash -c 'echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && pnpm test:e2e:anvil'
+ bash -c 'echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && nginx && pnpm test:e2e:anvil'
  networks:
  - x11
 

diff --git a/nginx.conf b/nginx.conf
@@ -0,0 +1,25 @@
+server {
+ listen 8545;
+ server_name localhost;
+
+ location / {
+ proxy_pass http://foundry:8545;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ }
+}
+
+server {
+ listen 8546;
+ server_name localhost;
+
+ location / {
+ proxy_pass http://foundry-metamask-test-dapp:8546;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ }
+}
diff --git a/start-tests-ci.sh b/start-tests-ci.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-docker-compose -f docker-compose.ci.yml --profile synpress --profile foundry up --build --exit-code-from synpress
+docker-compose -f docker-compose.ci.yml --profile synpress --profile foundry --profile foundry-metamask-test-dapp up --build --exit-code-from synpress
 # warning: it's not safe to use ngrok if you have secrets set as environmental variables
 # (someone could connect to your CI and steal your vars)
-# docker-compose -f docker-compose.ci.yml --profile synpress --profile foundry --profile ngrok up --build --exit-code-from synpress
+# docker-compose -f docker-compose.ci.yml --profile synpress --profile foundry --profile foundry-metamask-test-dapp --profile ngrok up --build --exit-code-from synpress
diff --git a/start-tests.sh b/start-tests.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker-compose --profile synpress --profile foundry up --build --exit-code-from synpress
+docker-compose --profile synpress --profile foundry --profile foundry-metamask-test-dapp up --build --exit-code-from synpress