Merge branch 'next' into master

[i3/i3] / travis / docker-build-and-push.sh

diff --git a/travis/docker-build-and-push.sh b/travis/docker-build-and-push.sh
index 7dfd3392b346604e02dfd43702cc3d369f2c8a1b..9b654a84703f5d2ad580d39d1620b3e76468e9e4 100755 (executable)
--- a/travis/docker-build-and-push.sh
+++ b/travis/docker-build-and-push.sh
@@ -2,10 +2,19 @@
 
 set -e
 
+BASENAME=$1
+DOCKERFILE=$2
+
 # .dockerignore is created on demand so that release.sh and other scripts are
 # not influenced by our travis setup.
 echo .git > .dockerignore
 
-docker build --pull --no-cache --rm -t=${BASENAME} -f travis-build.Dockerfile .
-docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASS}
-docker push ${BASENAME}
+docker build --pull --no-cache --rm -t=${BASENAME} -f ${DOCKERFILE} .
+# For pull requests, travis does not add secure environment variables to the
+# environment (because pull requests could then steal their values), so skip
+# the login+push step when the variable isn’t set.
+if [ -n "${DOCKER_PASS}" ]
+then
+       docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASS}
+       docker push ${BASENAME}
+fi