From f48c7c25d0c587a1df97b594b019667580d53050 Mon Sep 17 00:00:00 2001 From: Viet Nguyen Duc Date: Tue, 20 Aug 2024 07:33:37 +0000 Subject: [PATCH] docs: update image tag in reference docs Signed-off-by: Viet Nguyen Duc --- docker-compose-v3-full-grid-secure.yml | 16 ++++++++-------- docker-compose-v3-video-upload-dynamic-grid.yml | 4 ++-- docker-compose-v3-video-upload-standalone.yml | 12 ++++++------ tests/charts/make/chart_release.sh | 15 ++++++++------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/docker-compose-v3-full-grid-secure.yml b/docker-compose-v3-full-grid-secure.yml index 487f41408..9584bfb51 100644 --- a/docker-compose-v3-full-grid-secure.yml +++ b/docker-compose-v3-full-grid-secure.yml @@ -4,7 +4,7 @@ version: "3" services: selenium-event-bus: - image: selenium/event-bus:nightly + image: selenium/event-bus:4.23.1-20240820 container_name: selenium-event-bus ports: - "4442:4442" @@ -16,7 +16,7 @@ services: - SE_ENABLE_TLS=true selenium-sessions: - image: selenium/sessions:nightly + image: selenium/sessions:4.23.1-20240820 container_name: selenium-sessions ports: - "5556:5556" @@ -31,7 +31,7 @@ services: - SE_ENABLE_TLS=true selenium-session-queue: - image: selenium/session-queue:nightly + image: selenium/session-queue:4.23.1-20240820 container_name: selenium-session-queue volumes: - ./charts/selenium-grid/certs:/opt/selenium/secrets @@ -41,7 +41,7 @@ services: - SE_ENABLE_TLS=true selenium-distributor: - image: selenium/distributor:nightly + image: selenium/distributor:4.23.1-20240820 container_name: selenium-distributor ports: - "5553:5553" @@ -62,7 +62,7 @@ services: - SE_ENABLE_TLS=true selenium-router: - image: selenium/router:nightly + image: selenium/router:4.23.1-20240820 container_name: selenium-router ports: - "4444:4444" @@ -82,7 +82,7 @@ services: - SE_ENABLE_TLS=true chrome: - image: selenium/node-chrome:nightly + image: selenium/node-chrome:4.23.1-20240820 shm_size: 2gb depends_on: - selenium-event-bus @@ -97,7 +97,7 @@ services: - SE_SERVER_PROTOCOL=https edge: - image: selenium/node-edge:nightly + image: selenium/node-edge:4.23.1-20240820 shm_size: 2gb depends_on: - selenium-event-bus @@ -112,7 +112,7 @@ services: - SE_SERVER_PROTOCOL=https firefox: - image: selenium/node-firefox:nightly + image: selenium/node-firefox:4.23.1-20240820 shm_size: 2gb depends_on: - selenium-event-bus diff --git a/docker-compose-v3-video-upload-dynamic-grid.yml b/docker-compose-v3-video-upload-dynamic-grid.yml index 67a27db9e..e326754c1 100644 --- a/docker-compose-v3-video-upload-dynamic-grid.yml +++ b/docker-compose-v3-video-upload-dynamic-grid.yml @@ -15,7 +15,7 @@ services: stop_grace_period: 30s node-docker: - image: selenium/node-docker:latest + image: selenium/node-docker:4.23.1-20240820 volumes: - ./assets:/opt/selenium/assets - ./NodeDocker/config.toml:/opt/selenium/config.toml @@ -42,7 +42,7 @@ services: - SE_RCLONE_CONFIG_MYFTP_FTP_CONCURRENCY=10 selenium-hub: - image: selenium/hub:latest + image: selenium/hub:4.23.1-20240820 container_name: selenium-hub ports: - "4442:4442" diff --git a/docker-compose-v3-video-upload-standalone.yml b/docker-compose-v3-video-upload-standalone.yml index a6b128fbe..d21056183 100644 --- a/docker-compose-v3-video-upload-standalone.yml +++ b/docker-compose-v3-video-upload-standalone.yml @@ -15,7 +15,7 @@ services: stop_grace_period: 30s standalone_chrome: - image: selenium/standalone-chrome:latest + image: selenium/standalone-chrome:4.23.1-20240820 shm_size: 2gb ports: - "4444:4444" @@ -25,7 +25,7 @@ services: - SE_SUB_PATH=/selenium standalone_edge: - image: selenium/standalone-edge:latest + image: selenium/standalone-edge:4.23.1-20240820 shm_size: 2gb ports: - "5444:4444" @@ -35,7 +35,7 @@ services: - SE_SUB_PATH=/selenium standalone_firefox: - image: selenium/standalone-firefox:latest + image: selenium/standalone-firefox:4.23.1-20240820 shm_size: 2gb ports: - "6444:4444" @@ -45,7 +45,7 @@ services: - SE_SUB_PATH=/selenium chrome_video: - image: selenium/video:latest + image: selenium/video:ffmpeg-7.0.1-20240820 depends_on: - standalone_chrome environment: @@ -70,7 +70,7 @@ services: stop_grace_period: 30s edge_video: - image: selenium/video:latest + image: selenium/video:ffmpeg-7.0.1-20240820 depends_on: - standalone_edge environment: @@ -95,7 +95,7 @@ services: stop_grace_period: 30s firefox_video: - image: selenium/video:latest + image: selenium/video:ffmpeg-7.0.1-20240820 depends_on: - standalone_firefox environment: diff --git a/tests/charts/make/chart_release.sh b/tests/charts/make/chart_release.sh index cf0782fa0..91a1da42d 100755 --- a/tests/charts/make/chart_release.sh +++ b/tests/charts/make/chart_release.sh @@ -3,6 +3,14 @@ set -x NAMESPACE=${NAMESPACE:-"selenium"} # Function to be executed on command failure + +latest_chart_version=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]') +helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version} +if [[ $? -eq 0 ]]; then + echo "Chart version $latest_chart_version is already available in the registry" + exit 0 +fi + on_failure() { local exit_status=$? echo "There is step failed with exit status $exit_status" @@ -12,13 +20,6 @@ on_failure() { # Trap ERR signal and call on_failure function trap 'on_failure' ERR -latest_chart_version=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]') -helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version} -if [[ $? -eq 0 ]]; then - echo "Chart version $latest_chart_version is already available in the registry" - exit 0 -fi - CHART_PACKAGE_PATH=$(cat /tmp/selenium_chart_version) if [ -z "${CHART_PACKAGE_PATH}" ] || [ ! -f "${CHART_PACKAGE_PATH}" ]; then echo "Chart package path is empty. Please trigger chart_build.sh before this script."