Merge pull request #501 from Synthetixio/dev

promote dev to master
Synthetixio · Sep 14, 2022 · 5dc67d1 · 5dc67d1
2 parents 61b964f + 7fba74d
commit 5dc67d1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 27 deletions.
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -689,7 +689,7 @@ module.exports = {
     );
     return true;
   },
-  allowToAddNetwork: async ({ waitForEvent }) => {
+  allowToAddNetwork: async ({ waitForEvent } = {}) => {
     const notificationPage = await playwright.switchToMetamaskNotification();
     if (waitForEvent) {
       await playwright.waitAndClick(

diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
@@ -5,13 +5,13 @@ services:
     container_name: synpress
     build: .
     environment:
-      - DISPLAY=novnc:0.0
+      - DISPLAY=display:0.0
       - CYPRESS_PRIVATE_KEY_WITH_FUNDS=${CYPRESS_PRIVATE_KEY_WITH_FUNDS}
       - CYPRESS_PROJECT_ID=${CYPRESS_PROJECT_ID}
       - CYPRESS_RECORD_KEY=${CYPRESS_RECORD_KEY}
       - GITHUB_TOKEN=${GITHUB_TOKEN}
     depends_on:
-      - novnc
+      - display
       - video
     entrypoint: []
     working_dir: /app
@@ -21,17 +21,15 @@ services:
     command: >
       bash -c 'echo -n "======> local noVNC URL:
       http://localhost:8080/vnc.html?autoconnect=true " && npx wait-on
-      http://novnc:8080 && echo -n "======> remote noVNC URL: " && curl -s
-      ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && yarn test:e2e:ci'
+      http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s
+      ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && yarn test:e2e'
     networks:
       - x11
-
-  novnc:
-    container_name: novnc
-    image: theasp/novnc@sha256:cd5210a86611bc2dc3ea6eb96a2bfe91237983f8fbc1ab02175142e63e461c40
+  
+  display:
+    container_name: display
+    image: synthetixio/display:b2643097e891906524e52e7ee956260b20fa01fb-base
     environment:
-      - DISPLAY_WIDTH=1920
-      - DISPLAY_HEIGHT=1080
       - RUN_XTERM=no
     ports:
       - '8080:8080'
@@ -42,30 +40,24 @@ services:
     profiles:
       - ngrok
     container_name: ngrok
-    image: wernight/ngrok@sha256:f334773a21fdb8c88b320d74ed11f6a2f936840aa85b45e8ddb329823f8e1635
-    environment:
-      - NGROK_DEBUG=1
+    image: synthetixio/ngrok:b2643097e891906524e52e7ee956260b20fa01fb-base
     ports:
       - '4040:4040'
-    command: ['ngrok', 'http', 'novnc:8080', '--authtoken', '${NGROK_AUTH}']
+    command: ['ngrok', 'http', 'display:8080', '--authtoken', '${NGROK_AUTH}']
     depends_on:
-      - novnc
+      - display
     networks:
       - x11
 
   video:
     container_name: video
-    image: selenium/video@sha256:bf3948fd78e160b21726293488e108de25d26d515ce02fbba6790f2a1a2acde6
+    image: synthetixio/video:b2643097e891906524e52e7ee956260b20fa01fb-base
     volumes:
       - ./docker/videos-ci:/videos
     environment:
-      - SE_SCREEN_WIDTH=1920
-      - SE_SCREEN_HEIGHT=1080
-      - DISPLAY_CONTAINER_NAME=novnc
-      - DISPLAY_NUM=0
       - FILE_NAME=CI-full-video.mp4
     depends_on:
-      - novnc
+      - display
     networks:
       - x11
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
 
   display:
     container_name: display
-    image: synthetixio/display:8c262e845add19dd78dfb446dddfb695858f1906-base
+    image: synthetixio/display:b2643097e891906524e52e7ee956260b20fa01fb-base
     environment:
       - RUN_XTERM=no
     ports:
@@ -38,9 +38,7 @@ services:
     profiles:
       - ngrok
     container_name: ngrok
-    image: wernight/ngrok@sha256:f334773a21fdb8c88b320d74ed11f6a2f936840aa85b45e8ddb329823f8e1635
-    environment:
-      - NGROK_DEBUG=1
+    image: synthetixio/ngrok:b2643097e891906524e52e7ee956260b20fa01fb-base
     ports:
       - '4040:4040'
     command: ['ngrok', 'http', 'display:8080', '--authtoken', '${NGROK_AUTH}']
@@ -51,7 +49,7 @@ services:
 
   video:
     container_name: video
-    image: synthetixio/video:8c262e845add19dd78dfb446dddfb695858f1906-base
+    image: synthetixio/video:b2643097e891906524e52e7ee956260b20fa01fb-base
     volumes:
       - ./docker/videos-ci:/videos
     environment: