From c39c5b87448db4fe968eea8123229bfe576655fb Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 15 Aug 2017 17:22:36 -0400 Subject: [PATCH] NODEPOOL_DOCKER_REGISTRY_PROXY needs trailing slash for docker We likely want to change all our variables to have trailing slashes, but need to confirm other clients will be fine first. I've already tested docker, so make the change. Change-Id: I2c3fcb0b99b45b04068ef9be6a2887adf1f0ebab Signed-off-by: Paul Belanger --- nodepool/scripts/configure_mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh index 65bb487adb..c35c4bda9a 100755 --- a/nodepool/scripts/configure_mirror.sh +++ b/nodepool/scripts/configure_mirror.sh @@ -96,7 +96,7 @@ export NODEPOOL_UCA_MIRROR=${NODEPOOL_UCA_MIRROR:-http://$NODEPOOL_MIRROR_HOST/u export NODEPOOL_MARIADB_MIRROR=${NODEPOOL_MARIADB_MIRROR:-http://$NODEPOOL_MIRROR_HOST/ubuntu-mariadb} # Reverse proxy servers export NODEPOOL_BUILDLOGS_CENTOS_PROXY=${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/buildlogs.centos} -export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8081/registry-1.docker} +export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8081/registry-1.docker/} export NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/rdo} export NODEPOOL_RUGYGEMS_PROXY=${NODEPOOL_RUBYGEMS_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/rubygems/} export NODEPOOL_NPM_REGISTRY_PROXY=${NODEPOOL_NPM_REGISTRY_PROXY:-http://$NODEPOOL_MIRROR_HOST:8080/registry.npmjs}