cruft removal, docker login to mirror only if credentials are populated

broadinstitute · Dec 8, 2017 · 143c09c · 143c09c
1 parent de78c29
commit 143c09c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,6 @@ env:
 
   - DOCKER_REGISTRY_MIRROR="docker.io"
   - DOCKER_REPO_PROD_MIRROR="broadinstitute/viral-ngs"
-  #- DOCKER_REPO_DEV_MIRROR="broadinstitute/viral-ngs-dev"
 
   - BOTO_CONFIG=/dev/null # bogus value to override config on travis
   - _JAVA_OPTIONS="-Xmx3g" # overrides jvm opts set elsewhere; see: https://stackoverflow.com/questions/28327620/difference-between-java-options-java-tool-options-and-java-opts

diff --git a/travis/deploy-docker.sh b/travis/deploy-docker.sh
@@ -6,7 +6,10 @@ if [[ -n "$DOCKER_PASS" && -n "$DOCKER_USER" && -n "$DOCKER_REGISTRY" ]]; then
 
 	# log in to Docker registry
 	echo "$DOCKER_PASS" | docker login --password-stdin --username "$DOCKER_USER" "$DOCKER_REGISTRY"
-	echo "$DOCKER_PASS_MIRROR" | docker login --password-stdin --username "$DOCKER_USER_MIRROR" "$DOCKER_REGISTRY_MIRROR"
+
+	if [ -n "$DOCKER_USER_MIRROR" -a -n "$DOCKER_PASS_MIRROR" -a -n "$DOCKER_REGISTRY_MIRROR" ]; then
+		echo "$DOCKER_PASS_MIRROR" | docker login --password-stdin --username "$DOCKER_USER_MIRROR" "$DOCKER_REGISTRY_MIRROR"
+	fi
 
 	# tag and deploy
 	for TAG in `travis/list-docker-tags.sh`; do