Skip to content

Commit 9ea0f88

Browse files
daniel-ac-martindaniel-ac-martin
authored
Merge pull request #111 from UKHomeOffice/fix-pipeline-properly
Fix CI pipeline by upgrading the build image
2 parents 89d4014 + 2d3eb91 commit 9ea0f88

File tree

2 files changed

+67
-63
lines changed

2 files changed

+67
-63
lines changed

‎.drone.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ workspace:
33

44
pipeline:
55
build_and_test_image:
6-
image: quay.io/ukhomeofficedigital/centos-base:v0.5.7
6+
image: quay.io/ukhomeofficedigital/centos-base:latest
77
environment:
88
- DOCKER_HOST=tcp://172.17.0.1:2375
99
commands:

‎ci-build.sh‎

Lines changed: 66 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33
set -e
44

55
TAG=ngx
6-
PORT=8443
6+
BUILD_NUMBER="${BUILD_NUMBER:-${DRONE_BUILD_NUMBER}}"
7+
PORT=$((${BUILD_NUMBER} + 1025))
8+
BUILD_NUMBER="${BUILD_NUMBER:-local}"
79
START_INSTANCE="docker run "
810
DOCKER_HOST_NAME=172.17.0.1
9-
MUTUAL_TLS="mutual-tls"
10-
STANDARD_TLS="standard-tls"
11+
MOCKSERVER="mockserver-${BUILD_NUMBER}"
12+
SLOWMOCKSERVER="slowmockserver-${BUILD_NUMBER}"
13+
MUTUAL_TLS="mutual-tls-${BUILD_NUMBER}"
14+
STANDARD_TLS="standard-tls-${BUILD_NUMBER}"
1115
MOCKSERVER_PORT=9000
1216
SLOWMOCKSERVER_PORT=9001
1317
WORKDIR="/workdir/src/github.com/UKHomeOffice/docker-nginx-proxy"
@@ -23,16 +27,16 @@ function tear_down_container() {
2327
}
2428

2529
function tear_down() {
26-
tear_down_container ${INSTANCE}
30+
tear_down_container "${INSTANCE}"
2731
}
2832

2933
function clean_up() {
3034
rm -f /tmp/file.txt
31-
tear_down_container mockserver
32-
tear_down_container slowmockserver
33-
tear_down_container ${MUTUAL_TLS}
34-
tear_down_container ${STANDARD_TLS}
35-
tear_down_container ${TAG}
35+
tear_down_container "${MOCKSERVER}"
36+
tear_down_container "${SLOWMOCKSERVER}"
37+
tear_down_container "${MUTUAL_TLS}"
38+
tear_down_container "${STANDARD_TLS}"
39+
tear_down_container "${TAG}-${BUILD_NUMBER}"
3640
}
3741

3842
function add_files_to_container() {
@@ -48,7 +52,7 @@ function add_files_to_container() {
4852
}
4953

5054
function start_test() {
51-
INSTANCE=${TAG}
55+
INSTANCE="${TAG}-${BUILD_NUMBER}"
5256
tear_down
5357
HTTPS_LISTEN_PORT=${HTTPS_LISTEN_PORT:-10443}
5458
echo ""
@@ -88,22 +92,22 @@ echo "travis_fold:end:BUILD"
8892

8993
echo "Running mocking-server..."
9094
docker build -t mockserver:latest /workdir/src/github.com/UKHomeOffice/docker-nginx-proxy -f docker-config/Dockerfile.mockserver
91-
${STD_CMD} -d -p ${MOCKSERVER_PORT}:${MOCKSERVER_PORT} \
92-
--name=mockserver mockserver:latest \
95+
${STD_CMD} -d \
96+
--name="${MOCKSERVER}" mockserver:latest \
9397
-config=/test-servers.yaml \
9498
-debug \
9599
-port=${MOCKSERVER_PORT}
96-
docker run --rm --link mockserver:mockserver martin/wait
100+
docker run --rm --link "${MOCKSERVER}:${MOCKSERVER}" martin/wait -c "${MOCKSERVER}:${MOCKSERVER_PORT}"
97101

98102
echo "Running slow-mocking-server..."
99103
docker build -t slowmockserver:latest /workdir/src/github.com/UKHomeOffice/docker-nginx-proxy -f docker-config/Dockerfile.slowmockserver
100-
${STD_CMD} -d -p ${SLOWMOCKSERVER_PORT}:${SLOWMOCKSERVER_PORT} \
101-
--name=slowmockserver slowmockserver:latest \
104+
${STD_CMD} -d \
105+
--name="${SLOWMOCKSERVER}" slowmockserver:latest \
102106
-config=/test-servers.yaml \
103107
-monkeyConfig=/monkey-business.yaml \
104108
-debug \
105109
-port=${SLOWMOCKSERVER_PORT}
106-
docker run --rm --link slowmockserver:slowmockserver martin/wait
110+
docker run --rm --link "${SLOWMOCKSERVER}:${SLOWMOCKSERVER}" martin/wait -c "${SLOWMOCKSERVER}:${SLOWMOCKSERVER_PORT}"
107111

108112
echo "=========="
109113
echo "TESTING..."
@@ -116,32 +120,32 @@ start_test "Start with minimal settings" "${STD_CMD} \
116120
echo "Test it's up and working..."
117121
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
118122
echo "Test limited protcol and SSL cipher... "
119-
docker run --link ${TAG}:${TAG}--rm --entrypoint bash ngx -c "echo GET / | /usr/bin/openssl s_client -cipher 'AES256+EECDH' -tls1_2 -connect ${TAG}:10443" &> /dev/null;
123+
docker run --link ${INSTANCE}:${INSTANCE}--rm --entrypoint bash ngx -c "echo GET / | /usr/bin/openssl s_client -cipher 'AES256+EECDH' -tls1_2 -connect ${INSTANCE}:10443" &> /dev/null;
120124
echo "Test sslv2 not accepted...."
121-
if docker run --link ${TAG}:${TAG}--rm --entrypoint bash ngx -c "echo GET / | /usr/bin/openssl s_client -ssl2 -connect ${TAG}:10443" &> /dev/null; then
125+
if docker run --link ${INSTANCE}:${INSTANCE}--rm --entrypoint bash ngx -c "echo GET / | /usr/bin/openssl s_client -ssl2 -connect ${INSTANCE}:10443" &> /dev/null; then
122126
echo "FAIL SSL defaults settings allow ssl2 ......"
123127
exit 2
124128
fi
125129

126130
start_test "Test enabling GEODB settings" "${STD_CMD} \
127-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
131+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
128132
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
129133
-e \"DNSMASK=TRUE\" \
130134
-e \"ENABLE_UUID_PARAM=FALSE\" \
131135
-e \"ALLOW_COUNTRY_CSV=GB,FR,O1\" \
132-
--link mockserver:mockserver "
136+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
133137
echo "Test GeoIP config isn't rejected..."
134138
curl --fail -s -v -k https://${DOCKER_HOST_NAME}:${PORT}/
135139

136140
start_test "Test GEODB settings can reject..." "${STD_CMD} \
137-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
141+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
138142
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
139143
-e \"DNSMASK=TRUE\" \
140144
-e \"ENABLE_UUID_PARAM=FALSE\" \
141145
-e \"ALLOW_COUNTRY_CSV=CG\" \
142146
-e \"DENY_COUNTRY_ON=TRUE\" \
143147
-e \"ADD_NGINX_LOCATION_CFG=error_page 403 /nginx-proxy/50x.shtml;\" \
144-
--link mockserver:mockserver "
148+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
145149
echo "Test GeoIP config IS rejected..."
146150
if ! curl -v -k https://${DOCKER_HOST_NAME}:${PORT}/ 2>&1 \/ | grep '403 Forbidden' ; then
147151
echo "We were expecting to be rejected with 403 error here - we are not in the Congo!"
@@ -158,14 +162,14 @@ else
158162
fi
159163

160164
start_test "Test rate limits 1 per second" "${STD_CMD} \
161-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
165+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
162166
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
163167
-e \"DNSMASK=TRUE\" \
164168
-e \"ENABLE_UUID_PARAM=FALSE\" \
165169
-e \"REQS_PER_MIN_PER_IP=60\" \
166170
-e \"REQS_PER_PAGE=0\" \
167171
-e \"CONCURRENT_CONNS_PER_IP=1\" \
168-
--link mockserver:mockserver "
172+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
169173
echo "Test two connections in the same second get blocked..."
170174
curl --fail -v -k https://${DOCKER_HOST_NAME}:${PORT}/
171175
if curl -v -k https://${DOCKER_HOST_NAME}:${PORT}/ 2>&1 \
@@ -177,14 +181,14 @@ else
177181
fi
178182

179183
start_test "Test multiple concurrent connections in the same second get blocked" "${STD_CMD} \
180-
-e \"PROXY_SERVICE_HOST=http://slowmockserver\" \
184+
-e \"PROXY_SERVICE_HOST=http://${SLOWMOCKSERVER}\" \
181185
-e \"PROXY_SERVICE_PORT=${SLOWMOCKSERVER_PORT}\" \
182186
-e \"DNSMASK=TRUE\" \
183187
-e \"ENABLE_UUID_PARAM=FALSE\" \
184188
-e \"REQS_PER_MIN_PER_IP=60\" \
185189
-e \"REQS_PER_PAGE=0\" \
186190
-e \"CONCURRENT_CONNS_PER_IP=1\" \
187-
--link slowmockserver:slowmockserver "
191+
--link \"${SLOWMOCKSERVER}:${SLOWMOCKSERVER}\" "
188192
echo "First background some requests..."
189193
curl -v -k https://${DOCKER_HOST_NAME}:${PORT} &>/dev/null &
190194
curl -v -k https://${DOCKER_HOST_NAME}:${PORT} &>/dev/null &
@@ -200,11 +204,11 @@ else
200204
fi
201205

202206
start_test "Test response has gzip" "${STD_CMD} \
203-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
207+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
204208
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
205209
-e \"DNSMASK=TRUE\" \
206210
-e \"ENABLE_UUID_PARAM=FALSE\" \
207-
--link mockserver:mockserver "
211+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
208212
echo "Test gzip ok..."
209213
curl -s -I -X GET -k --compressed https://${DOCKER_HOST_NAME}:${PORT}/gzip | grep -q 'Content-Encoding: gzip'
210214

@@ -214,7 +218,7 @@ start_test "Start with SSL CIPHER set and PROTOCOL" "${STD_CMD} \
214218
-e \"SSL_CIPHERS=RC4-MD5\" \
215219
-e \"SSL_PROTOCOLS=TLSv1.1\""
216220
echo "Test excepts defined protocol and cipher....."
217-
docker run --link ${TAG}:${TAG} --rm --entrypoint bash ngx -c "echo GET / | /usr/bin/openssl s_client -cipher 'RC4-MD5' -tls1_1 -connect ${TAG}:10443" &> /dev/null;
221+
docker run --link ${INSTANCE}:${INSTANCE} --rm --entrypoint bash ngx -c "echo GET / | /usr/bin/openssl s_client -cipher 'RC4-MD5' -tls1_1 -connect ${INSTANCE}:10443" &> /dev/null;
218222

219223

220224

@@ -349,13 +353,13 @@ start_test "Start with succeeding upstream server verification" \
349353
tear_down_container "${STANDARD_TLS}"
350354

351355
start_test "Start with Custom error pages redirect off" "${STD_CMD} \
352-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
356+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
353357
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
354358
-e \"LOCATIONS_CSV=/,/api/\" \
355359
-e \"ERROR_REDIRECT_CODES_2=502\" \
356360
-e \"DNSMASK=TRUE\" \
357361
-e \"ENABLE_UUID_PARAM=FALSE\" \
358-
--link mockserver:mockserver "
362+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
359363
echo "Test All ok..."
360364
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
361365
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/api/
@@ -369,8 +373,8 @@ fi
369373
#--------------------------------------------------------------------------------------------------
370374
# currently fails here
371375
#wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
372-
#docker ps -a --filter "status=running" | grep ${TAG}
373-
#docker logs ${TAG}
376+
#docker ps -a --filter "status=running" | grep ${INSTANCE}
377+
#docker logs ${INSTANCE}
374378
#wget -O /dev/null --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
375379
#tear_down_container "${STANDARD_TLS}"
376380

@@ -380,12 +384,12 @@ fi
380384
# -------------
381385

382386
start_test "Test custom error pages..." "${STD_CMD} \
383-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
387+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
384388
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
385389
-e \"DNSMASK=TRUE\" \
386390
-e \"ENABLE_UUID_PARAM=FALSE\" \
387391
-e \"ERROR_REDIRECT_CODES=502 404 500\" \
388-
--link mockserver:mockserver "
392+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
389393
if curl -k https://${DOCKER_HOST_NAME}:${PORT}/not-found | grep "404 Not Found" ; then
390394
if curl -k https://${DOCKER_HOST_NAME}:${PORT}/api/dead | grep "An error occurred" ; then
391395
echo "Passed custom error pages with ERROR_REDIRECT_CODES"
@@ -399,13 +403,13 @@ else
399403
fi
400404

401405
start_test "Start with Custom upload size" "${STD_CMD} \
402-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
406+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
403407
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
404408
-e \"CLIENT_MAX_BODY_SIZE=15\" \
405409
-e \"NAXSI_USE_DEFAULT_RULES=FALSE\" \
406410
-e \"ENABLE_UUID_PARAM=FALSE\" \
407411
-e \"DNSMASK=TRUE\" \
408-
--link mockserver:mockserver "
412+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
409413
dd if=/dev/urandom of=/tmp/file.txt bs=1048576 count=10
410414

411415
echo "Upload a large file"
@@ -416,115 +420,115 @@ grep "Thanks for the big doc" /tmp/upload_test.txt &> /dev/null
416420

417421
start_test "Start with listen for port 80" "${STD_CMD} \
418422
-p 8888:10080 \
419-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
423+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
420424
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
421425
-e \"DNSMASK=TRUE\" \
422426
-e \"ENABLE_UUID_PARAM=FALSE\" \
423427
-e \"HTTPS_REDIRECT_PORT=${PORT}\" \
424-
--link mockserver:mockserver "
428+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
425429
echo "Test Redirect ok..."
426430
wget -O /dev/null --quiet --no-check-certificate http://${DOCKER_HOST_NAME}:8888/
427431

428432

429433
start_test "Test text logging format..." "${STD_CMD} \
430-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
434+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
431435
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
432436
-e \"DNSMASK=TRUE\" \
433437
-e \"LOG_FORMAT_NAME=text\" \
434438
-e \"ENABLE_UUID_PARAM=FALSE\" \
435-
--link mockserver:mockserver "
439+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
436440
echo "Test request (with logging as text)..."
437441
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
438442
echo "Testing text logs format..."
439443
docker logs ${INSTANCE} | grep "\"GET / HTTP/1.1\" 200"
440444

441445
start_test "Test json logging format..." "${STD_CMD} \
442-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
446+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
443447
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
444448
-e \"DNSMASK=TRUE\" \
445449
-e \"LOG_FORMAT_NAME=json\" \
446450
-e \"ENABLE_UUID_PARAM=FALSE\" \
447-
--link mockserver:mockserver "
451+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
448452
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}?animal=cow
449453
echo "Testing json logs format..."
450454
docker logs ${INSTANCE} | grep '{"proxy_proto_address":'
451455
docker logs ${INSTANCE} | grep 'animal=cow'
452456

453457

454458
start_test "Test param logging off option works..." "${STD_CMD} \
455-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
459+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
456460
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
457461
-e \"DNSMASK=TRUE\" \
458462
-e \"LOG_FORMAT_NAME=json\" \
459463
-e \"ENABLE_UUID_PARAM=FALSE\" \
460464
-e \"NO_LOGGING_URL_PARAMS=TRUE\" \
461-
--link mockserver:mockserver "
465+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
462466
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}?animal=cow
463467
echo "Testing no logging of url params option works..."
464468
docker logs ${INSTANCE} 2>/dev/null | grep '{"proxy_proto_address":'
465469
docker logs ${INSTANCE} 2>/dev/null | grep 'animal=cow' | wc -l | grep 0
466470

467471
start_test "Test ENABLE_WEB_SOCKETS..." "${STD_CMD} \
468-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
472+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
469473
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
470474
-e \"DNSMASK=TRUE\" \
471475
-e \"ENABLE_WEB_SOCKETS=TRUE\" \
472476
-e \"ENABLE_UUID_PARAM=FALSE\" \
473-
--link mockserver:mockserver "
477+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
474478
wget -O /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/
475479

476480
start_test "Test ADD_NGINX_LOCATION_CFG param..." "${STD_CMD} \
477-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
481+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
478482
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
479483
-e \"LOCATIONS_CSV=/,/api/\" \
480484
-e \"ADD_NGINX_LOCATION_CFG=return 200 NICE;\" \
481485
-e \"DNSMASK=TRUE\" \
482486
-e \"ENABLE_UUID_PARAM=FALSE\" \
483-
--link mockserver:mockserver "
487+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
484488
echo "Test extra param works"
485489
wget -O - -o /dev/null --quiet --no-check-certificate https://${DOCKER_HOST_NAME}:${PORT}/wow | grep "NICE"
486490

487491

488492
start_test "Test UUID GET param logging option works..." "${STD_CMD} \
489-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
493+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
490494
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
491495
-e \"DNSMASK=TRUE\" \
492496
-e \"ENABLE_UUID_PARAM=TRUE\" \
493-
--link mockserver:mockserver "
497+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
494498
curl -sk https://${DOCKER_HOST_NAME}:${PORT}
495499
echo "Testing no logging of url params option works..."
496-
docker logs mockserver | grep '?nginxId='
500+
docker logs "${MOCKSERVER}" | grep '?nginxId='
497501
docker logs ${INSTANCE} | grep '"nginx_uuid": "'
498502

499503
start_test "Test UUID GET param logging option works with other params..." "${STD_CMD} \
500-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
504+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
501505
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
502506
-e \"DNSMASK=TRUE\" \
503507
-e \"ENABLE_UUID_PARAM=TRUE\" \
504-
--link mockserver:mockserver "
508+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
505509
curl -sk https://${DOCKER_HOST_NAME}:${PORT}/?foo=bar
506510
echo "Testing no logging of url params option works..."
507-
docker logs mockserver | grep '?foo=bar&nginxId='
511+
docker logs "${MOCKSERVER}" | grep '?foo=bar&nginxId='
508512
docker logs ${INSTANCE} | grep '"nginx_uuid": "'
509513

510514
start_test "Test UUID header logging option works..." "${STD_CMD} \
511-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
515+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
512516
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
513517
-e \"DNSMASK=TRUE\" \
514518
-e \"ENABLE_UUID_PARAM=HEADER\" \
515-
--link mockserver:mockserver "
519+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
516520
curl -sk https://${DOCKER_HOST_NAME}:${PORT}
517521
echo "Testing no logging of url params option works..."
518-
docker logs mockserver | grep 'Nginxid:'
522+
docker logs "${MOCKSERVER}" | grep 'Nginxid:'
519523
docker logs ${INSTANCE} | grep '"nginx_uuid": "'
520524

521525
start_test "Test VERBOSE_ERROR_PAGES=TRUE displays debug info" "${STD_CMD} \
522-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
526+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
523527
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
524528
-e \"DNSMASK=TRUE\" \
525529
-e \"ENABLE_UUID_PARAM=FALSE\" \
526530
-e \"VERBOSE_ERROR_PAGES=TRUE\" \
527-
--link mockserver:mockserver "
531+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
528532
if curl -k https://${DOCKER_HOST_NAME}:${PORT}/\?\"==\` | grep "Sorry, we are refusing to process your request." ; then
529533
echo "Testing VERBOSE_ERROR_PAGES works..."
530534
else
@@ -533,11 +537,11 @@ else
533537
fi
534538

535539
start_test "Test VERBOSE_ERROR_PAGES is not set does not display debug info" "${STD_CMD} \
536-
-e \"PROXY_SERVICE_HOST=http://mockserver\" \
540+
-e \"PROXY_SERVICE_HOST=http://${MOCKSERVER}\" \
537541
-e \"PROXY_SERVICE_PORT=${MOCKSERVER_PORT}\" \
538542
-e \"DNSMASK=TRUE\" \
539543
-e \"ENABLE_UUID_PARAM=FALSE\" \
540-
--link mockserver:mockserver "
544+
--link \"${MOCKSERVER}:${MOCKSERVER}\" "
541545
if curl -k https://${DOCKER_HOST_NAME}:${PORT}/\?\"==\` | grep "Sorry, we are refusing to process your request." ; then
542546
echo "Testing VERBOSE_ERROR_PAGES failed..."
543547
exit 1

0 commit comments

Comments
 (0)