From 4270949de8a8f3ebb765769828d51ff79db15855 Mon Sep 17 00:00:00 2001 From: Manuel Vogel Date: Mon, 9 Apr 2018 15:17:06 +0200 Subject: [PATCH] Updated private registry port to 15000 for fix teamcity build. --- .travis.yml | 2 +- scripts/runAccTests.sh | 8 ++++---- scripts/testing/setup_private_registry.sh | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86537792..1344f73d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ install: # See: https://github.com/golang/go/issues/12933 - bash scripts/gogetcookie.sh - go get github.com/kardianos/govendor -- sudo sed 's/DOCKER_OPTS="/DOCKER_OPTS="--insecure-registry=127.0.0.1:5000 /g' -i /etc/default/docker +- sudo sed 's/DOCKER_OPTS="/DOCKER_OPTS="--insecure-registry=127.0.0.1:15000 /g' -i /etc/default/docker - sudo cat /etc/default/docker - sudo service docker restart diff --git a/scripts/runAccTests.sh b/scripts/runAccTests.sh index f6415a96..3182d325 100755 --- a/scripts/runAccTests.sh +++ b/scripts/runAccTests.sh @@ -9,10 +9,10 @@ log() { } setup() { - export DOCKER_REGISTRY_ADDRESS="127.0.0.1:5000" + export DOCKER_REGISTRY_ADDRESS="127.0.0.1:15000" export DOCKER_REGISTRY_USER="testuser" export DOCKER_REGISTRY_PASS="testpwd" - export DOCKER_PRIVATE_IMAGE="127.0.0.1:5000/my-private-service:v1" + export DOCKER_PRIVATE_IMAGE="127.0.0.1:15000/my-private-service:v1" sh scripts/testing/setup_private_registry.sh } @@ -35,7 +35,7 @@ cleanup() { echo "### removed auth and certs ###" docker stop private_registry echo "### stopped private registry ###" - docker rmi -f $(docker images -aq 127.0.0.1:5000/my-private-service) + docker rmi -f $(docker images -aq 127.0.0.1:15000/my-private-service) echo "### removed my-private-service images ###" # consider running this manually to clean up the # updateabe configs and secrets @@ -54,4 +54,4 @@ fi # cuz it cannot remove the images if [ "$TRAVIS" != "true" ]; then log "cleanup" && cleanup -fi \ No newline at end of file +fi diff --git a/scripts/testing/setup_private_registry.sh b/scripts/testing/setup_private_registry.sh index d0feaa76..b80a3131 100755 --- a/scripts/testing/setup_private_registry.sh +++ b/scripts/testing/setup_private_registry.sh @@ -15,7 +15,7 @@ openssl req \ mkdir -p scripts/testing/auth # Start registry docker run --entrypoint htpasswd registry:2 -Bbn testuser testpwd > scripts/testing/auth/htpasswd -docker run -d -p 5000:5000 --rm --name private_registry \ +docker run -d -p 15000:5000 --rm --name private_registry \ -v "$(pwd)"/scripts/testing/auth:/auth \ -e "REGISTRY_AUTH=htpasswd" \ -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \ @@ -27,12 +27,12 @@ docker run -d -p 5000:5000 --rm --name private_registry \ # wait a bit for travis... sleep 5 # Login to private registry -docker login -u testuser -p testpwd 127.0.0.1:5000 +docker login -u testuser -p testpwd 127.0.0.1:15000 # Build private images docker build -t my-private-service ./scripts/testing -f ./scripts/testing/Dockerfile_v1 -docker tag my-private-service 127.0.0.1:5000/my-private-service:v1 +docker tag my-private-service 127.0.0.1:15000/my-private-service:v1 docker build -t my-private-service ./scripts/testing -f ./scripts/testing/Dockerfile_v2 -docker tag my-private-service 127.0.0.1:5000/my-private-service:v2 +docker tag my-private-service 127.0.0.1:15000/my-private-service:v2 # Push private images into private registry -docker push 127.0.0.1:5000/my-private-service:v1 -docker push 127.0.0.1:5000/my-private-service:v2 +docker push 127.0.0.1:15000/my-private-service:v1 +docker push 127.0.0.1:15000/my-private-service:v2