From 5b704c9028f7adcd1e96d7559a8d310662b102d3 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 13 Feb 2023 15:49:57 +0100 Subject: [PATCH 1/3] Upgrade chrome and hub --- .env.example | 4 ++-- docker-compose.yml | 21 +++------------------ 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.env.example b/.env.example index 50d12a1..0f25c57 100644 --- a/.env.example +++ b/.env.example @@ -105,10 +105,10 @@ POSTGRES_TAG=13-1.16.0 TRAEFIK_TAG=v2.0 ### --- HUB --- -HUB_TAG=3.141.59-neon +HUB_TAG=4.1.3 ### --- CHROME --- -CHROME_TAG=3.141.59-neon +CHROME_TAG=4.1.3 ### --- BACKSTOPJS ---- BACKSTOPJS_TAG=6.1.4 diff --git a/docker-compose.yml b/docker-compose.yml index 99de9ce..01c4162 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -178,8 +178,6 @@ services: hub: image: selenium/hub:$HUB_TAG container_name: ${PROJECT_NAME}_hub - #ports: - # - "4444:4444" chrome: image: selenium/node-chrome:$CHROME_TAG @@ -187,22 +185,9 @@ services: depends_on: - hub environment: - - HUB_HOST=hub -# - HUB_PORT=4444 - - # BUG: Standalone chrome image can't be used until this is resolved: - # https://bugs.chromium.org/p/chromedriver/issues/detail?id=3857 -# chrome: -# image: selenium/standalone-chrome:$SELENIUM_CHROME_TAG -# container_name: "${PROJECT_NAME}_chrome" -# entrypoint: -# - chromedriver -# - "--no-sandbox" -# - "--disable-dev-shm-usage" -# - "--log-path=/tmp/chromedriver.log" -# - "--verbose" -# - "--whitelisted-ips=" - + - SE_EVENT_BUS_HOST=hub + - SE_EVENT_BUS_PUBLISH_PORT=4442 + - SE_EVENT_BUS_SUBSCRIBE_PORT=4443 # phantomjs: # image: wernight/phantomjs:${PHANTOMJS_VERSION} From 37ba47da30609ede7a5e05d12aaca0d94885eede Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 13 Feb 2023 15:50:27 +0100 Subject: [PATCH 2/3] CHROME - Allow to setup shm size --- .env.example | 2 ++ docker-compose.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.env.example b/.env.example index 0f25c57..56cc175 100644 --- a/.env.example +++ b/.env.example @@ -127,3 +127,5 @@ SELENIUM_CHROME_TAG=3.141 WEBGRIND_TAG=1.8-1.20.0 XHPROF_TAG=2.7.0 MKDOCS_TAG=1.1.0 + +SHM_SIZE=256 diff --git a/docker-compose.yml b/docker-compose.yml index 01c4162..087103a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -182,6 +182,7 @@ services: chrome: image: selenium/node-chrome:$CHROME_TAG container_name: "${PROJECT_NAME}_chrome" + shm_size: ${SHM_SIZE} depends_on: - hub environment: From d49eead7d2fa547daa318734307b106b02109ff1 Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 13 Feb 2023 15:59:04 +0100 Subject: [PATCH 3/3] CHROME - Fix typo in SHM size --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 56cc175..3b35d18 100644 --- a/.env.example +++ b/.env.example @@ -128,4 +128,4 @@ WEBGRIND_TAG=1.8-1.20.0 XHPROF_TAG=2.7.0 MKDOCS_TAG=1.1.0 -SHM_SIZE=256 +SHM_SIZE=256M \ No newline at end of file