Improve & cleanup build hooks

Author: aservedio

hooks/build

@@ -1,40 +1,16 @@
 #!/bin/bash
 
 
-# grab latest tags
-PHP_TAGS=$(curl 'https://registry.hub.docker.com/v2/repositories/library/php/tags?page_size=1024' | grep -Po "[0-9]+\.[0-9]+\.[0-9]+-apache" | sed 's/-apache//' | sort | uniq)
-IS_MASTER_BUILD=$([ "$SOURCE_BRANCH" == "master" ] && echo 1 || echo 0)
+SCRIPT_DIR="$(dirname "$0")"
+source "${SCRIPT_DIR}/common"
 
-echo "##### Build default image - ${IMAGE_NAME} #####"
-docker build --build-arg PHP_VERSION_TAG=${PHP_VERSION_TAG} -f $DOCKERFILE_PATH -t ${IMAGE_NAME} .
-
-if [ $IS_MASTER_BUILD -eq 1 ]; then
-
-  for PHP_MINOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+\.[0-9]+" | sort | uniq); do
-    echo "##### Build ${PHP_MINOR} #####"
-    docker build --build-arg PHP_VERSION_TAG=${PHP_MINOR}-apache -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:${PHP_MINOR} .
-  done
-
-  for PHP_VERSION in $(echo "$PHP_TAGS"); do
-    echo "##### Build $PHP_VERSION (x.y.z) #####"
-    docker build --build-arg PHP_VERSION_TAG=${PHP_VERSION}-apache -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:${PHP_VERSION} .
-  done
 
-else
-
-  CURRENT_RELEASE=$(echo $SOURCE_BRANCH | cut -c2-)
-
-  for PHP_MINOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+\.[0-9]+" | sort | uniq); do
-    SHORT_DOCKER_TAG=$(echo $CURRENT_RELEASE | cut -d'.' -f-2)
-    CUSTOM_IMAGE_NAME="${DOCKER_REPO}:php${PHP_MINOR}-v${SHORT_DOCKER_TAG}"
-    echo "##### Build $CUSTOM_IMAGE_NAME #####"
-    docker build --build-arg PHP_VERSION_TAG=${PHP_MINOR}-apache -f ${DOCKERFILE_PATH} -t ${CUSTOM_IMAGE_NAME} .
-  done
-
-  for PHP_VERSION in $(echo "$PHP_TAGS"); do
-    CUSTOM_IMAGE_NAME="${DOCKER_REPO}:php${PHP_VERSION}-v${CURRENT_RELEASE}"
-    echo "##### Build $CUSTOM_IMAGE_NAME #####"
-    docker build --build-arg PHP_VERSION_TAG=${PHP_VERSION}-apache -f ${DOCKERFILE_PATH} -t ${CUSTOM_IMAGE_NAME} .
-  done
+echo "##### Build default tag ${DOCKER_TAG} from ${PHP_VERSION_TAG} #####"
+docker build --build-arg PHP_VERSION_TAG=${PHP_VERSION_TAG} -f $DOCKERFILE_PATH -t ${IMAGE_NAME} .
 
-fi
+for BUILD_PARAMS in $(getBuildParams $IS_MASTER_BUILD); do
+  FROM=$(echo $BUILD_PARAMS | cut -d'|' -f1)
+  TAG=$(echo $BUILD_PARAMS | cut -d'|' -f2)
+  echo "##### Build tag ${TAG} from ${FROM} #####"
+  docker build --build-arg PHP_VERSION_TAG=${FROM} -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:${TAG} .
+done

hooks/common

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+
+IS_MASTER_BUILD=$([ "$SOURCE_BRANCH" == "master" ] && echo 1 || echo 0)
+IS_RELEASE_BUILD=$((echo "$SOURCE_BRANCH" | grep -Pq "v[0-9]+\.[0-9]+\.[0-9]+") && echo 1 || echo 0)
+
+# return list of "<phpFromSource>|<targetTag>" depending if we are building against master or a specific release
+getBuildParams() {
+  local RELEASE=$(echo $SOURCE_BRANCH | cut -c2-)
+  local MAJOR_RELEASE=$(echo $RELEASE | cut -d'.' -f1)
+  local MINOR_RELEASE=$(echo $RELEASE | cut -d'.' -f-2)
+  local PHP_MINOR=""
+  local PHP_TAGS=$(curl 'https://registry.hub.docker.com/v2/repositories/library/php/tags?page_size=1024' | grep -Po "[0-9]+\.[0-9]+\.[0-9]+-apache" | sed 's/-apache//' | sort | uniq)
+  local PHP_VERSION=""
+
+  for PHP_MINOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+\.[0-9]+" | sort | uniq); do
+    if [ $IS_MASTER_BUILD -eq 1 ]; then
+      echo "${PHP_MINOR}-apache|php${PHP_MINOR}"
+    elif [ $IS_RELEASE_BUILD -eq 1 ]; then
+      echo "${PHP_MINOR}-apache|php${PHP_MINOR}-v${MAJOR_RELEASE}"
+      echo "${PHP_MINOR}-apache|php${PHP_MINOR}-v${MINOR_RELEASE}"
+      echo "${PHP_MINOR}-apache|php${PHP_MINOR}-v${RELEASE}"
+    fi
+  done
+
+  for PHP_VERSION in $(echo "$PHP_TAGS"); do
+    if [ $IS_MASTER_BUILD -eq 1 ]; then
+      echo "${PHP_VERSION}-apache|php${PHP_VERSION}"
+    elif [ $IS_RELEASE_BUILD -eq 1 ]; then
+      echo "${PHP_VERSION}-apache|php${PHP_VERSION}-v${MAJOR_RELEASE}"
+      echo "${PHP_VERSION}-apache|php${PHP_VERSION}-v${MINOR_RELEASE}"
+      echo "${PHP_VERSION}-apache|php${PHP_VERSION}-v${RELEASE}"
+    fi
+  done
+}

hooks/post_push

@@ -1,37 +1,12 @@
 #!/bin/bash
 
 
-# grab latest tags
-PHP_TAGS=$(curl 'https://registry.hub.docker.com/v2/repositories/library/php/tags?page_size=1024' | grep -Po "[0-9]+\.[0-9]+\.[0-9]+-apache" | sed 's/-apache//' | sort | uniq)
-IS_MASTER_BUILD=$([ "$SOURCE_BRANCH" == "master" ] && echo 1 || echo 0)
+SCRIPT_DIR="$(dirname "$0")"
+source "${SCRIPT_DIR}/common"
 
-if [ $IS_MASTER_BUILD -eq 1 ]; then
 
-  for PHP_MINOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+\.[0-9]+" | sort | uniq); do
-    echo "##### Push ${PHP_MINOR} #####"
-    docker push ${DOCKER_REPO}:${PHP_MINOR}
-  done
-
-  for PHP_VERSION in $(echo "$PHP_TAGS"); do
-    echo "##### Push $PHP_VERSION (x.y.z) #####"
-    docker push ${DOCKER_REPO}:${PHP_VERSION}
-  done
-
-else
-
-  CURRENT_RELEASE=$(echo $SOURCE_BRANCH | cut -c2-)
-
-  for PHP_MINOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+\.[0-9]+" | sort | uniq); do
-    SHORT_DOCKER_TAG=$(echo $CURRENT_RELEASE | cut -d'.' -f-2)
-    CUSTOM_IMAGE_NAME="${DOCKER_REPO}:php${PHP_MINOR}-v${SHORT_DOCKER_TAG}"
-    echo "##### Push $CUSTOM_IMAGE_NAME #####"
-    docker push -t ${CUSTOM_IMAGE_NAME}
-  done
-
-  for PHP_VERSION in $(echo "$PHP_TAGS"); do
-    CUSTOM_IMAGE_NAME="${DOCKER_REPO}:php${PHP_VERSION}-v${CURRENT_RELEASE}"
-    echo "##### Push $CUSTOM_IMAGE_NAME #####"
-    docker push -t ${CUSTOM_IMAGE_NAME}
-  done
-
-fi
+for BUILD_PARAMS in $(getBuildParams); do
+  TAG=$(echo $BUILD_PARAMS | cut -d'|' -f2)
+  echo "##### Push tag ${TAG} #####"
+  echo docker push ${DOCKER_REPO}:${TAG}
+done