Added check for existing image name (local vs cloud build)

Author: grimzy

CHANGELOG.md

@@ -8,9 +8,9 @@ This project adheres to [Semantic Versioning][semver].
 
 Refer to master branch
 
-## \[v1.1.1\] - 2019-10-13
+## \[v1.1.1\] - 2019-10-14
 
-### Split PHP builds, PHP FPM:
+### Split PHP builds, PHP FPM, Latest tag:
 - Split builds by PHP version and variant
 - Use builds Docker hooks in Makefile
 - Added `fpm` variant

build/hooks/_common

@@ -33,4 +33,9 @@ if [ -n "${DOCKER_TAG}" ]; then
   fi
 fi
 
+HAS_IMAGE_NAME=
+if [ -n "$IMAGE_NAME" ];then
+  HAS_IMAGE_NAME=1
+fi
+
 echo

build/hooks/build

@@ -17,7 +17,7 @@ for php_version in $PHP_VERSIONS; do
     xdebug_version=-2.5.5
   fi
   for php_variant in $PHP_VARIANTS; do
-    if [ -z "$IMAGE_NAME" ]; then
+    if [ -z "$HAS_IMAGE_NAME" ] || [ -z "$IMAGE_NAME" ]; then
       IMAGE_NAME="$DOCKER_REPO:$php_version-$php_variant-$SOURCE_BRANCH"
       echo ">>> Set IMAGE_NAME to: $IMAGE_NAME"
     fi

build/hooks/post_push

@@ -14,7 +14,7 @@ SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z
 
 for php_version in $PHP_VERSIONS; do
   for php_variant in $PHP_VARIANTS; do
-    if [ -z "$IMAGE_NAME" ]; then
+    if [ -z "$HAS_IMAGE_NAME" ] || [ -z "$IMAGE_NAME" ]; then
       IMAGE_NAME="$DOCKER_REPO:$php_version-$php_variant-$SOURCE_BRANCH"
       echo ">>> Set IMAGE_NAME to: $IMAGE_NAME"
     fi