Changing the way how the docker-image is pulled

Author: Chris Wiechmann

.travis.yml

@@ -30,11 +30,9 @@ before_install:
   #- sudo apt-get install curl
   # All files in this folder will be cached for the next build
   - mkdir -p $CACHE_DIR
-  # Login to the Docker-Registry
-  - if [ ! -f $CACHE_FILE_APIM ]; then docker login --username $AXWAY_DOCKER_REG_USER --password $AXWAY_DOCKER_REG_PASS docker-registry.demo.axway.com; fi
   # Downloading the APIM-Docker-Image takes too long (Timeout 10 minutes) - Externalized to make use of travis_wait
   # In this script, we are either using the cached version or download a new Docker-Image
-  - travis_wait build/pull_apim_docker_image.sh $CACHE_FILE_APIM
+  - travis_wait build/pull_apim_docker_image.sh
   # Now it's time to safe the downloaded API-Management Docker-Image into the cache folder
   - if [ ! -f $CACHE_FILE_APIM ]; then docker save $APIM_DOCKER_IMAGE | gzip > $CACHE_FILE_APIM; fi
   # Pull Cassandra Image or use the cache

build/pull_apim_docker_image.sh

@@ -1,10 +1,13 @@
 #!/bin/sh
 
+set -x
+
 if [ -f $CACHE_FILE_APIM -a ! $SKIP_CACHE="true" ]
 then
 	echo "Loading API-Manager docker image: $APIM_DOCKER_IMAGE from $CACHE_FILE_APIM"
 	gunzip -c $CACHE_FILE_APIM | docker load
 else
 	echo "Pulling APIM docker from registry, this will take a while"
+	docker login --username $AXWAY_DOCKER_REG_USER --password $AXWAY_DOCKER_REG_PASS docker-registry.demo.axway.com
 	docker pull $APIM_DOCKER_IMAGE
 fi