Skip to content

Commit 9d54fae

Browse files
Zerpetmergify[bot]
authored andcommitted
Make Selenium test images configurable
Because it makes it easier to customise the image. For example, to run with an older or newer version, or to customise the registry and use a proxy. (cherry picked from commit a152547)
1 parent 366c643 commit 9d54fae

File tree

10 files changed

+15
-15
lines changed

10 files changed

+15
-15
lines changed

selenium/bin/components/devkeycloak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
KEYCLOAK_DOCKER_IMAGE=quay.io/keycloak/keycloak:20.0
3+
KEYCLOAK_DOCKER_IMAGE=${KEYCLOAK_DOCKER_IMAGE:-quay.io/keycloak/keycloak:20.0}
44

55
init_devkeycloak() {
66
DEVKEYCLOAK_CONFIG_PATH=${DEVKEYCLOAK_CONFIG_PATH:-multi-oauth/devkeycloak}

selenium/bin/components/devkeycloak-proxy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
HTTPD_DOCKER_IMAGE=httpd:latest
1+
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32

43
ensure_devkeycloak-proxy() {
54
if docker ps | grep devkeycloak-proxy &> /dev/null; then

selenium/bin/components/forward-proxy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
HTTPD_DOCKER_IMAGE=httpd:latest
1+
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32

43
ensure_forward-proxy() {
54
if docker ps | grep forward-proxy &> /dev/null; then

selenium/bin/components/keycloak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
KEYCLOAK_DOCKER_IMAGE=quay.io/keycloak/keycloak:20.0
3+
KEYCLOAK_DOCKER_IMAGE=${KEYCLOAK_DOCKER_IMAGE:-quay.io/keycloak/keycloak:20.0}
44

55
ensure_keycloak() {
66
if docker ps | grep keycloak &> /dev/null; then

selenium/bin/components/mock-auth-backend-http

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ ensure_mock-auth-backend-http() {
1010
init_mock-auth-backend-http() {
1111
AUTH_BACKEND_HTTP_BASEURL=${AUTH_BACKEND_HTTP_BASEURL:-http://localhost:8888}
1212
AUTH_BACKEND_HTTP_DIR=${TEST_CASES_DIR}/mock-auth-backend-http
13+
MOCKSERVER_DOCKER_IMAGE=${MOCKSERVER_DOCKER_IMAGE:-mockserver/mockserver}
1314

1415
print "> AUTH_BACKEND_HTTP_BASEURL: ${AUTH_BACKEND_HTTP_BASEURL}"
1516
print "> AUTH_BACKEND_HTTP_DIR: ${AUTH_BACKEND_HTTP_DIR}"
17+
print "> MOCKSERVER_DOCKER_IMAGE: ${MOCKSERVER_DOCKER_IMAGE}"
1618

1719
}
1820
start_mock-auth-backend-http() {
@@ -28,7 +30,7 @@ start_mock-auth-backend-http() {
2830
--publish 8888:1080 \
2931
--env MOCKSERVER_INITIALIZATION_JSON_PATH="/config/defaultExpectations.json" \
3032
-v ${AUTH_BACKEND_HTTP_DIR}:/config \
31-
mockserver/mockserver
33+
${MOCKSERVER_DOCKER_IMAGE}
3234

3335
wait_for_url $AUTH_BACKEND_HTTP_BASEURL/ready
3436
end "mock-auth-backend-http is ready"

selenium/bin/components/mock-auth-backend-ldap

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ ensure_mock-auth-backend-ldap() {
99
}
1010
init_mock-auth-backend-ldap() {
1111
AUTH_BACKEND_LDAP_DIR=${TEST_CONFIG_DIR}/mock-auth-backend-ldap
12+
OPENLDAP_DOCKER_IMAGE=${OPENLDAP_DOCKER_IMAGE:-osixia/openldap:1.5.0}
1213

1314
print "> AUTH_BACKEND_LDAP_DIR: ${AUTH_BACKEND_LDAP_DIR}"
15+
print "> OPENLDAP_DOCKER_IMAGE: ${OPENLDAP_DOCKER_IMAGE}"
1416
}
1517
start_mock-auth-backend-ldap() {
1618
begin "Starting mock-auth-backend-ldap ..."
@@ -28,7 +30,7 @@ start_mock-auth-backend-ldap() {
2830
--publish 389:389 \
2931
--publish 636:636 \
3032
-v ${AUTH_BACKEND_LDAP_DIR}:/config \
31-
osixia/openldap:1.5.0
33+
${OPENLDAP_DOCKER_IMAGE}
3234

3335
wait_for_message mock-auth-backend-ldap "starting"
3436
docker exec mock-auth-backend-ldap ldapadd \

selenium/bin/components/prodkeycloak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
KEYCLOAK_DOCKER_IMAGE=quay.io/keycloak/keycloak:20.0
3+
KEYCLOAK_DOCKER_IMAGE=${KEYCLOAK_DOCKER_IMAGE:-quay.io/keycloak/keycloak:20.0}
44

55
ensure_prodkeycloak() {
66
if docker ps | grep prodkeycloak &> /dev/null; then

selenium/bin/components/prodkeycloak-proxy

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
HTTPD_DOCKER_IMAGE=httpd:latest
1+
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32

43
ensure_prodkeycloak-proxy() {
54
if docker ps | grep prodkeycloak-proxy &> /dev/null; then
@@ -17,7 +16,7 @@ init_prodkeycloak-proxy() {
1716
print "> PROXY_HOSTNAME: ${PROXY_HOSTNAME}"
1817
print "> PROXY_PORT: ${PROXY_PORT}"
1918

20-
}
19+
print "> HTTPD_DOCKER_IMAGE: ${HTTPD_DOCKER_IMAGE}"
2120

2221
start_prodkeycloak-proxy() {
2322
begin "Starting prodkeycloak-proxy ..."

selenium/bin/components/proxy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
HTTPD_DOCKER_IMAGE=httpd:latest
1+
HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32

43
ensure_proxy() {
54
if docker ps | grep proxy &> /dev/null; then

selenium/bin/components/uaa

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
UAA_DOCKER_IMAGE=cloudfoundry/uaa:75.21.0
3+
UAA_DOCKER_IMAGE=${UAA_DOCKER_IMAGE:-cloudfoundry/uaa:75.21.0}
44

55
ensure_uaa() {
66
if docker ps | grep uaa &> /dev/null; then

0 commit comments

Comments
 (0)