From d35c884a72f68ae3e5686745482a380f0903060b Mon Sep 17 00:00:00 2001
From: William Wong <compulim@hotmail.com>
Date: Wed, 6 Dec 2023 03:27:14 -0800
Subject: [PATCH] Remove chrome.dockerfile

---
 .github/workflows/pull-request-validation.yml | 3 +--
 chrome.dockerfile                             | 7 -------
 docker-compose-wsl2.yml                       | 6 +++---
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 chrome.dockerfile

diff --git a/.github/workflows/pull-request-validation.yml b/.github/workflows/pull-request-validation.yml
index b5224f2c41..33691bd758 100644
--- a/.github/workflows/pull-request-validation.yml
+++ b/.github/workflows/pull-request-validation.yml
@@ -48,14 +48,13 @@ jobs:
 
       - run: npm run build --if-present
 
-      - name: Pack ./__tests__
+      - name: Pack Docker artifact
         run: |
           zip docker.zip -r@ <<EOF
           ./__tests__/
           ./babel-jest-config.js
           ./babel-passthru-transformer.js
           ./babel.config.json
-          ./chrome.dockerfile
           ./docker-compose-wsl2.yml
           ./jest.config.js
           ./package.json
diff --git a/chrome.dockerfile b/chrome.dockerfile
deleted file mode 100644
index 60b685cc01..0000000000
--- a/chrome.dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# https://github.com/SeleniumHQ/docker-selenium
-# https://hub.docker.com/r/selenium/standalone-chrome/tags/
-
-FROM selenium/node-chrome:110.0
-
-ADD __tests__/html/assets/uploads /home/seluser/Downloads
-ADD __tests__/setup/local /home/seluser/Downloads
diff --git a/docker-compose-wsl2.yml b/docker-compose-wsl2.yml
index 3e55b37bca..f84f3b702d 100644
--- a/docker-compose-wsl2.yml
+++ b/docker-compose-wsl2.yml
@@ -4,9 +4,7 @@ services:
   # On Windows, run with COMPOSE_CONVERT_WINDOWS_PATHS=1
 
   chrome:
-    build:
-      context: ./
-      dockerfile: chrome.dockerfile
+    image: selenium/node-chrome:110.0
     depends_on:
       - selenium-hub
       - webchat
@@ -18,6 +16,8 @@ services:
       SE_OPTS: '--log-level WARNING'
       SE_NODE_SESSION_TIMEOUT: '300'
     shm_size: '2.5gb'
+    volumes:
+      - ./__tests__/html/assets/uploads/:/home/seluser/Downloads
 
   selenium-hub:
     image: selenium/hub:4.8.1