From f8638dfeefd03ad33dee6899aed05b91ddbfb24e Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Tue, 4 Dec 2018 01:57:30 +0100
Subject: [PATCH] Update build script

---
 build.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index c018382..152e029 100755
--- a/build.sh
+++ b/build.sh
@@ -35,6 +35,8 @@ echo "PROJECT=${PROJECT}"
 echo "VERSION=${VERSION}"
 echo "BUILD_DATE=${BUILD_DATE}"
 echo "BUILD_TAG=${BUILD_TAG}"
+echo "BUILD_WORKINGDIR=${BUILD_WORKINGDIR}"
+echo "DOCKERFILE=${DOCKERFILE}"
 echo "VCS_REF=${VCS_REF}"
 echo "PUSH_LATEST=${PUSH_LATEST}"
 echo "DOCKER_LOGIN=${DOCKER_LOGIN}"
@@ -79,9 +81,16 @@ while read LOGLINE; do
     exit 1
   fi
 done < <(docker logs -f ${PROJECT} 2>&1)
-docker rm -f ${PROJECT} > /dev/null 2>&1 || true
 echo
 
+CONTAINER_STATUS=$(docker container inspect --format "{{.State.Status}}" ${PROJECT})
+if [[ ${CONTAINER_STATUS} != "running" ]]; then
+  >&2 echo "ERROR: Container ${PROJECT} returned status '$CONTAINER_STATUS'"
+  docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+  exit 1
+fi
+docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+
 if [ "${VERSION}" == "local" -o "${TRAVIS_PULL_REQUEST}" == "true" ]; then
   echo "INFO: This is a PR or a local build, skipping push..."
   exit 0