travis-ci.sh: Print an error if TRAVIS_BRANCH, DOCKER_PASSWORD, or DO…

…CKER_LOGIN is undefined or empty.
mrunge · Sep 1, 2020 · 5ad9214 · 5ad9214
1 parent f47b7e6
commit 5ad9214
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/travis-ci.sh b/travis-ci.sh
@@ -1,18 +1,15 @@
-#!/bin/sh -e
+#!/bin/bash
 
-if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
+set -ex
+
+if [[ "${TRAVIS_PULL_REQUEST}" != "false" ]]; then
   echo "Not building docker images out of Pull Requests"
   exit 0
 fi
 
-if [ ! -z "${TRAVIS_BRANCH}" ]; then
-  SLUG="collectd/ci:${TRAVIS_BRANCH}"
-  docker build --pull -t "${SLUG}" .
-  docker inspect "${SLUG}"
-  docker history "${SLUG}"
-  echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_LOGIN}" --password-stdin
-  docker push "${SLUG}"
-else
-  echo 'no $TRAVIS_BRANCH defined, exiting'
-  exit 1
-fi
+declare -r SLUG="collectd/ci:${TRAVIS_BRANCH:?}"
+docker build --pull -t "${SLUG}" .
+docker inspect "${SLUG}"
+docker history "${SLUG}"
+echo "${DOCKER_PASSWORD:?}" | docker login --username "${DOCKER_LOGIN:?}" --password-stdin
+docker push "${SLUG}"