travis: remove deprecated docker login -e flag (#3651)

[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 76e2a1322d3728755741fb1111dd9d084732d949..686b81b0e2aaa01b9bfdae15847679a307ed113f 100755 (executable)
--- a/travis/docker-build-and-push.sh
+++ b/travis/docker-build-and-push.sh
@@ -2,16 +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 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 login -u ${DOCKER_USER} -p ${DOCKER_PASS}
        docker push ${BASENAME}
 fi