updated hooks for new makefile format

lushpush · Oct 19, 2017 · a1379a5 · a1379a5
1 parent 47810ff
commit a1379a5
Show file tree

Hide file tree

Showing 29 changed files with 145 additions and 29 deletions.
diff --git a/alluxio/hooks/post_build b/alluxio/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/apache-drill/hooks/post_build b/apache-drill/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/cassandra-dev/hooks/post_build b/cassandra-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/consul-dev/hooks/post_build b/consul-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/consul/hooks/post_build b/consul/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/h2o/hooks/post_build b/h2o/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/hadoop-dev/hooks/post_build b/hadoop-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/hadoop/hooks/post_build b/hadoop/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/hbase-dev/hooks/post_build b/hbase-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/hbase/hooks/post_build b/hbase/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/jython/hooks/post_build b/jython/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/kafka/hooks/post_build b/kafka/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/mesos/hooks/post_build b/mesos/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/nifi/hooks/post_build b/nifi/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/presto-admin/hooks/post_build b/presto-admin/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/presto/hooks/post_build b/presto/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/rabbitmq-cluster/hooks/post_build b/rabbitmq-cluster/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/ranger/hooks/post_build b/ranger/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/riak-dev/hooks/post_build b/riak-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/riak/hooks/post_build b/riak/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/serf/hooks/post_build b/serf/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/solr/hooks/post_build b/solr/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/solrcloud-dev/hooks/post_build b/solrcloud-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/solrcloud/hooks/post_build b/solrcloud/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/spark/hooks/post_build b/spark/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/tachyon/hooks/post_build b/tachyon/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/teamcity/hooks/post_build b/teamcity/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/zookeeper-dev/hooks/post_build b/zookeeper-dev/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"

diff --git a/zookeeper/hooks/post_build b/zookeeper/hooks/post_build
@@ -22,7 +22,11 @@ highest_tag="unknown"
 current_scala="2.11"
 
 if [ -z "${IMAGE_NAME:-}" ]; then
-    IMAGE_NAME="$(awk -F= '/^REPO=/{print $2}' "$srcdir/../Makefile")"
+    IMAGE_NAME="$(awk -F= '/^[[:space:]]*REPO[[:space:]]*:*=/{gsub (" ", "", $2); print $2}' "$srcdir/../Makefile")"
+    if [ -z "$IMAGE_NAME" ]; then
+        echo "FAILED to determine IMAGE_NAME From Makefile"
+        exit 1
+    fi
     echo "IMAGE_NAME not set, determined from Makefile to be '$IMAGE_NAME'"
 fi
 DOCKER_REPO="${DOCKER_REPO:-${IMAGE_NAME/:*}}"