@@ -214,20 +214,37 @@ wait_for_oidc_endpoint_docker() {
214214calculate_rabbitmq_url () {
215215 echo " ${RABBITMQ_SCHEME:- http} ://$1 ${PUBLIC_RABBITMQ_PATH:- $RABBITMQ_PATH } "
216216}
217-
217+ calculate_forward_proxy_url () {
218+ PROXIED_URL=$1
219+ PROXY_HOSTNAME=$2
220+ PROXY_PORT=$3
221+ SCHEME=$( echo " $PROXIED_URL " | cut -d: -f1)
222+ PATH=$( echo " $PROXIED_URL " | cut -d/ -f4-)
223+ echo " $SCHEME ://$PROXY_HOSTNAME :$PROXY_PORT /$PATH "
224+ }
218225wait_for_url () {
219- BASE_URL=$1
226+ BASE_URL=$1
220227 if [[ $BASE_URL == * " localhost" ** ]]; then
221- wait_for_url_local $BASE_URL
228+ wait_for_url_local $@
222229 else
223- wait_for_url_docker $BASE_URL
230+ wait_for_url_docker $@
224231 fi
225232}
226233wait_for_url_local () {
227234 url=$1
235+ proxy=${2:- none}
236+ proxy_user=${3:- none}
237+ proxy_pass=$4
238+ curl_args=" -L -f -v"
228239 max_retry=10
229240 counter=0
230- until (curl -L -f -v $url > /dev/null 2>&1 )
241+ if [[ " $proxy " != " none" ]]; then
242+ curl_args=" --proxy ${proxy} ${curl_args} "
243+ fi
244+ if [[ " $proxy_user " != " none" ]]; then
245+ curl_args=" --proxy-user ${proxy_user} :${proxy_pass} ${curl_args} "
246+ fi
247+ until (curl $curl_args $url > /dev/null 2>&1 )
231248 do
232249 print " Waiting for $url to start (local)"
233250 sleep 5
@@ -240,7 +257,14 @@ wait_for_url_docker() {
240257 url=$1
241258 max_retry=10
242259 counter=0
243- until (docker run --net ${DOCKER_NETWORK} --rm curlimages/curl:7.85.0 -L -f -v $url > /dev/null 2>&1 )
260+ curl_args=" -L -f -v"
261+ if [[ " $proxy " != " none" ]]; then
262+ curl_args=" --proxy ${proxy} ${curl_args} "
263+ fi
264+ if [[ " $proxy_user " != " none" ]]; then
265+ curl_args=" --proxy-user ${proxy_user} :${proxy_pass} ${curl_args} "
266+ fi
267+ until (docker run --net ${DOCKER_NETWORK} --rm curlimages/curl:7.85.0 $curl_args $url > /dev/null 2>&1 )
244268 do
245269 print " Waiting for $url to start (docker)"
246270 sleep 5
0 commit comments