Merge pull request #123 from ggozad/CHORE-selenium-4

Upgrade to Selenium 4
ggozad · Nov 10, 2022 · 5efd1f4 · 5efd1f4
2 parents bd63f39 + f5ae92d
commit 5efd1f4
Show file tree

Hide file tree

Showing 12 changed files with 345 additions and 102 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,18 @@
 Changelog
 =========
 
+3.1.0 - 2022-11-10
+------------------
+
+- Upgrade to selenium 4.
+  [ggozad]
+
+- Simplify docker compose config.
+  [ggozad]
+
+- Fix file download tests in selenoid.
+  [ggozad]
+
 3.0.7 - 2022-11-09
 ------------------
 

diff --git a/config/browsers.json b/config/browsers.json
diff --git a/config/selenoid/Dockerfile b/config/selenoid/Dockerfile
@@ -0,0 +1,9 @@
+FROM aerokube/selenoid:latest-release
+ARG BUILDPLATFORM
+ARG DOWNLOAD_VOLUME
+
+RUN apk add gettext
+
+COPY browsers.json.template /etc/selenoid/browsers.json.template
+RUN export CHROME_IMAGE=$([ "${BUILDPLATFORM}" = "linux/arm64" ] && echo "sskorol/selenoid_chromium_vnc:100.0" || echo "selenoid/chrome") && \
+    envsubst < /etc/selenoid/browsers.json.template > /etc/selenoid/browsers.json
diff --git a/config/browsers.arm64.json → config/selenoid/browsers.json.template b/config/browsers.arm64.json → config/selenoid/browsers.json.template
@@ -6,17 +6,23 @@
         "image": "selenoid/firefox",
         "port": "4444",
         "path": "/wd/hub",
-        "tmpfs": { "/tmp": "size=512m" }
+        "tmpfs": { "/tmp": "size=512m" },
+        "volumes": [
+          "${DOWNLOAD_VOLUME}:/home/selenium/Downloads"
+        ]
       }
     }
   },
   "chrome": {
     "default": "latest",
     "versions": {
       "latest": {
-        "image": "sskorol/selenoid_chromium_vnc:100.0",
+        "image": "$CHROME_IMAGE",
         "port": "4444",
-        "tmpfs": { "/tmp": "size=512m" }
+        "tmpfs": { "/tmp": "size=512m" },
+        "volumes": [
+          "${DOWNLOAD_VOLUME}:/home/selenium/Downloads"
+        ]
       }
     }
   }

diff --git a/docker-compose.arm64.yml b/docker-compose.arm64.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -48,17 +48,20 @@ services:
     entrypoint: echo "Only here to make sure the image is available to selenoid"
 
   selenoid:
+    container_name: selenoid
     networks:
       - behaving
-    image: aerokube/selenoid:latest-release
+    build:
+      args:
+        - DOWNLOAD_VOLUME=$PWD/var/downloads
+      context: config/selenoid
     volumes:
-      - "./config:/etc/selenoid"
       - "/var/run/docker.sock:/var/run/docker.sock"
       - "./var/video:/opt/selenoid/video"
       - "./var/log:/opt/selenoid/logs"
-
     environment:
       - OVERRIDE_VIDEO_OUTPUT_DIR=./var/video
+
     command:
       [
         "-conf",