Merge remote-tracking branch 'origin/master'

# Conflicts:
#	build/hooks/_common

Author: grimzy

CHANGELOG.md

@@ -8,13 +8,15 @@ 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
 - Now using `DOCKER_REPO` and `DOCKER_TAG` build variables
+- Push `latest` tags when building latest version (checks for Semantic Version in $SOURCE_BRANCH)
+- Set latest PHP version to  7.2 and variant to CLI
 
 ## \[v1.1.0\] - 2019-10-13
 

Makefile

@@ -1,15 +1,13 @@
-# SOURCE_BRANCH
-SOURCE_BRANCH=1.1.1
 
-# DOCKER_REPO and DOCKER_TAG:
-# https://docs.docker.com/docker-hub/builds/advanced/#custom-build-phase-hooks
+# https://docs.docker.com/docker-hub/builds/advanced/#environment-variables-for-building-and-testing
+SOURCE_BRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
 DOCKER_REPO=jestefane/php-dev
 DOCKER_TAG=
 
-# Possible versions: 5.5 5.6 7.0 7.1 7.2
+# Possible PHP versions: 5.5, 5.6, 7.0, 7.1, 7.2
 PHP_VERSIONS=5.5 5.6 7.0 7.1 7.2
 
-# Possible VARIANT: cli, fpm, apache, alpine
+# Possible PHP variants: cli, fpm
 PHP_VARIANTS=cli fpm
 
 BIN_DIR=/usr/local/bin

build/Dockerfile

@@ -1,6 +1,5 @@
-# Possible versions: 5.5, 5.6, 7.0, 7.1, 7.2
+# PHP version and variant to build (defaults are latest)
 ARG BUILD_PHP_VERSION=7.2
-# Possible VARIANT: cli, fpm, apache, alpine
 ARG BUILD_PHP_VARIANT=cli
 
 FROM php:$BUILD_PHP_VERSION-$BUILD_PHP_VARIANT

build/hooks/build

@@ -1,25 +1,40 @@
 #!/usr/bin/env bash
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+echo "************************************************"
+echo "*               Start build hook               *"
+echo "************************************************"
+echo
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 # shellcheck source=./_common
 . "$DIR/_common"
 
 for php_version in $PHP_VERSIONS; do
   xdebug_version=
   if [ "$php_version" == "5.5" ] || [ "$php_version" == "5.6" ]; then
-    echo "Using XDebug version $xdebug_version"
+    echo "Using XDebug version: ${xdebug_version:-latest}"
     xdebug_version=-2.5.5
-  fi;
+  fi
   for php_variant in $PHP_VARIANTS; do
-    image_name="$DOCKER_REPO:$php_version-$php_variant-$SOURCE_BRANCH"
-    echo "Building image: $image_name"
+    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
+
+    echo "Building image: $IMAGE_NAME"
     docker build \
-      -t "$image_name" \
+      -t "$IMAGE_NAME" \
       --build-arg BUILD_PHP_VERSION="$php_version" \
       --build-arg BUILD_PHP_VARIANT="$php_variant" \
       --build-arg BUILD_XDEBUG_VERSION="$xdebug_version" "$DIR/.."
   done
 done
 
+echo
+echo "************************************************"
+echo "*                End build hook                *"
+echo "************************************************"
+echo
+
 exit 0

build/hooks/post_push

@@ -1,16 +1,46 @@
 #!/usr/bin/env bash
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+echo "************************************************"
+echo "*             Start post_push hook             *"
+echo "************************************************"
+echo
+
+DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 # shellcheck source=./_common
 . "$DIR/_common"
 
+SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
+
 for php_version in $PHP_VERSIONS; do
   for php_variant in $PHP_VARIANTS; do
-    image_name="$DOCKER_REPO:$php_version-$php_variant-$SOURCE_BRANCH"
-    echo Pushing tag: "$image_name"
-    docker push "$image_name"
+    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
+
+    # Is this a release?
+    if [[ $SOURCE_BRANCH =~ $SEMVER_REGEX ]]; then
+      # Set the short tags
+      short_tag="$DOCKER_REPO:$php_version-$php_variant"
+      echo Pushing short tag: "$short_tag"
+      docker tag "$IMAGE_NAME" "$short_tag"
+
+      # Is this the latest PHP version/variant?
+      if [ "$php_version" == "7.2" ] && [ "$php_variant" == "cli" ]; then
+        latest_tag="$DOCKER_REPO:latest"
+        echo Pushing latest tag: "$latest_tag"
+        docker tag "$IMAGE_NAME" "$latest_tag"
+      fi
+      docker push "$latest_tag"
+    fi
   done
 done
 
+echo
+echo "************************************************"
+echo "*              End post_push hook              *"
+echo "************************************************"
+echo
+
 exit 0