From 3853aa1594af193808e904b9e7ae00a62d9367cc Mon Sep 17 00:00:00 2001 From: Aitor Perez <1515757+Zerpet@users.noreply.github.com> Date: Fri, 24 Oct 2025 12:14:03 +0100 Subject: [PATCH] Make all selenium component images configurable Because it makes it easy to override them in CI. For example, to use a proxy --- selenium/bin/components/devkeycloak-proxy | 2 ++ selenium/bin/components/forward-proxy | 2 ++ selenium/bin/components/mock-auth-backend-http | 3 ++- selenium/bin/components/mock-auth-backend-ldap | 3 ++- selenium/bin/components/other-rabbitmq | 2 +- selenium/bin/components/prodkeycloak-proxy | 2 ++ selenium/bin/components/proxy | 2 ++ selenium/bin/components/rabbitmq | 2 +- 8 files changed, 14 insertions(+), 4 deletions(-) diff --git a/selenium/bin/components/devkeycloak-proxy b/selenium/bin/components/devkeycloak-proxy index 18ddbe209cc5..6841cea43d31 100644 --- a/selenium/bin/components/devkeycloak-proxy +++ b/selenium/bin/components/devkeycloak-proxy @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest} ensure_devkeycloak-proxy() { diff --git a/selenium/bin/components/forward-proxy b/selenium/bin/components/forward-proxy index 06ed2c4f110c..dffcc94e180d 100644 --- a/selenium/bin/components/forward-proxy +++ b/selenium/bin/components/forward-proxy @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest} ensure_forward-proxy() { diff --git a/selenium/bin/components/mock-auth-backend-http b/selenium/bin/components/mock-auth-backend-http index e02622357bcc..6cdc30e58c39 100644 --- a/selenium/bin/components/mock-auth-backend-http +++ b/selenium/bin/components/mock-auth-backend-http @@ -1,5 +1,7 @@ #!/usr/bin/env bash +MOCKSERVER_DOCKER_IMAGE=${MOCKSERVER_DOCKER_IMAGE:-mockserver/mockserver} + ensure_mock-auth-backend-http() { if docker ps | grep mock-auth-backend-http &> /dev/null; then print "mock-auth-backend-http already running ..." @@ -10,7 +12,6 @@ ensure_mock-auth-backend-http() { init_mock-auth-backend-http() { AUTH_BACKEND_HTTP_BASEURL=${AUTH_BACKEND_HTTP_BASEURL:-http://localhost:8888} AUTH_BACKEND_HTTP_DIR=${TEST_CASES_DIR}/mock-auth-backend-http - MOCKSERVER_DOCKER_IMAGE=${MOCKSERVER_DOCKER_IMAGE:-mockserver/mockserver} print "> AUTH_BACKEND_HTTP_BASEURL: ${AUTH_BACKEND_HTTP_BASEURL}" print "> AUTH_BACKEND_HTTP_DIR: ${AUTH_BACKEND_HTTP_DIR}" diff --git a/selenium/bin/components/mock-auth-backend-ldap b/selenium/bin/components/mock-auth-backend-ldap index abe6837be547..4be06208ba62 100644 --- a/selenium/bin/components/mock-auth-backend-ldap +++ b/selenium/bin/components/mock-auth-backend-ldap @@ -1,5 +1,7 @@ #!/usr/bin/env bash +OPENLDAP_DOCKER_IMAGE=${OPENLDAP_DOCKER_IMAGE:-osixia/openldap:1.5.0} + ensure_mock-auth-backend-ldap() { if docker ps | grep mock-auth-backend-ldap &> /dev/null; then print "mock-auth-backend-ldap already running ..." @@ -9,7 +11,6 @@ ensure_mock-auth-backend-ldap() { } init_mock-auth-backend-ldap() { AUTH_BACKEND_LDAP_DIR=${TEST_CONFIG_DIR}/mock-auth-backend-ldap - OPENLDAP_DOCKER_IMAGE=${OPENLDAP_DOCKER_IMAGE:-osixia/openldap:1.5.0} print "> AUTH_BACKEND_LDAP_DIR: ${AUTH_BACKEND_LDAP_DIR}" print "> OPENLDAP_DOCKER_IMAGE: ${OPENLDAP_DOCKER_IMAGE}" diff --git a/selenium/bin/components/other-rabbitmq b/selenium/bin/components/other-rabbitmq index 473071cca4f1..7ed61e33146b 100644 --- a/selenium/bin/components/other-rabbitmq +++ b/selenium/bin/components/other-rabbitmq @@ -2,10 +2,10 @@ SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +RABBITMQ_DOCKER_IMAGE=${RABBITMQ_DOCKER_IMAGE:-rabbitmq} init_other_rabbitmq() { RABBITMQ_CONFIG_DIR=${TEST_CONFIG_DIR} - RABBITMQ_DOCKER_IMAGE=${RABBITMQ_DOCKER_IMAGE:-rabbitmq} OTHER_RABBITMQ_HOSTNAME=${OTHER_RABBITMQ_HOSTNAME:-other-rabbitmq} print "> RABBITMQ_CONFIG_DIR: ${RABBITMQ_CONFIG_DIR}" diff --git a/selenium/bin/components/prodkeycloak-proxy b/selenium/bin/components/prodkeycloak-proxy index ad4f70b6ca04..005d912bbc5c 100644 --- a/selenium/bin/components/prodkeycloak-proxy +++ b/selenium/bin/components/prodkeycloak-proxy @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest} ensure_prodkeycloak-proxy() { diff --git a/selenium/bin/components/proxy b/selenium/bin/components/proxy index c797c4d797ad..90e33494df7d 100644 --- a/selenium/bin/components/proxy +++ b/selenium/bin/components/proxy @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest} ensure_proxy() { diff --git a/selenium/bin/components/rabbitmq b/selenium/bin/components/rabbitmq index 2157ef7f18ca..104bc30e5c43 100644 --- a/selenium/bin/components/rabbitmq +++ b/selenium/bin/components/rabbitmq @@ -2,10 +2,10 @@ SCRIPT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +RABBITMQ_DOCKER_IMAGE=${RABBITMQ_DOCKER_IMAGE:-rabbitmq} init_rabbitmq() { RABBITMQ_CONFIG_DIR=${TEST_CONFIG_DIR} - RABBITMQ_DOCKER_IMAGE=${RABBITMQ_DOCKER_IMAGE:-rabbitmq} print "> RABBITMQ_CONFIG_DIR: ${RABBITMQ_CONFIG_DIR}" print "> RABBITMQ_DOCKER_IMAGE: ${RABBITMQ_DOCKER_IMAGE}"