File tree Expand file tree Collapse file tree 10 files changed +15
-15
lines changed Expand file tree Collapse file tree 10 files changed +15
-15
lines changed Original file line number Diff line number Diff line change 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
55init_devkeycloak () {
66 DEVKEYCLOAK_CONFIG_PATH=${DEVKEYCLOAK_CONFIG_PATH:- multi-oauth/ devkeycloak}
Original file line number Diff line number Diff line change 1-
2- HTTPD_DOCKER_IMAGE=httpd:latest
1+ HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32
43ensure_devkeycloak-proxy() {
54 if docker ps | grep devkeycloak-proxy &> /dev/null; then
Original file line number Diff line number Diff line change 1-
2- HTTPD_DOCKER_IMAGE=httpd:latest
1+ HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32
43ensure_forward-proxy() {
54 if docker ps | grep forward-proxy &> /dev/null; then
Original file line number Diff line number Diff line change 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
55ensure_keycloak () {
66 if docker ps | grep keycloak & > /dev/null; then
Original file line number Diff line number Diff line change @@ -10,9 +10,11 @@ ensure_mock-auth-backend-http() {
1010init_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}
1820start_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"
Original file line number Diff line number Diff line change @@ -9,8 +9,10 @@ ensure_mock-auth-backend-ldap() {
99}
1010init_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}
1517start_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 \
Original file line number Diff line number Diff line change 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
55ensure_prodkeycloak () {
66 if docker ps | grep prodkeycloak & > /dev/null; then
Original file line number Diff line number Diff line change 1-
2- HTTPD_DOCKER_IMAGE=httpd:latest
1+ HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32
43ensure_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
2221start_prodkeycloak-proxy() {
2322 begin "Starting prodkeycloak-proxy ..."
Original file line number Diff line number Diff line change 1-
2- HTTPD_DOCKER_IMAGE=httpd:latest
1+ HTTPD_DOCKER_IMAGE=${HTTPD_DOCKER_IMAGE:-httpd:latest}
32
43ensure_proxy() {
54 if docker ps | grep proxy &> /dev/null; then
Original file line number Diff line number Diff line change 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
55ensure_uaa () {
66 if docker ps | grep uaa & > /dev/null; then
You can’t perform that action at this time.
0 commit comments