Minor tweaks

Author: aservedio

hooks/build

@@ -5,6 +5,7 @@
 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)
 
 if [ $DOCKER_TAG == "latest" ]; then
+
   docker build -f $DOCKERFILE_PATH -t ${IMAGE_NAME} .
 
   for PHP_MAJOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+" | sort | uniq); do
@@ -19,16 +20,13 @@ if [ $DOCKER_TAG == "latest" ]; then
 
   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} .
+    docker build --build-arg PHP_VERSION_TAG=${PHP_VERSION}-apache -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:${PHP_VERSION}-latest .
   done
 
-  #docker build --build-arg PHP_VERSION_TAG=7.1-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.1-latest .
-  #docker build --build-arg PHP_VERSION_TAG=7.2-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.2-latest .
-  #docker build --build-arg PHP_VERSION_TAG=7.3-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.3-latest .
-  #docker build --build-arg PHP_VERSION_TAG=7.4-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.4-latest .
 else
+
   # I think we kind of have to build that default ~UI~ box. Naming it x-*
-  docker build --build-arg PHP_VERSION_TAG=apache -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:x-${DOCKER_TAG} .
+  docker build --build-arg PHP_VERSION_TAG=apache -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:${DOCKER_TAG} .
 
   for PHP_MAJOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+" | sort | uniq); do
     echo "##### Build ${PHP_MAJOR}-${DOCKER_TAG} (phpVersion-basePhpApacheVersion) #####"
@@ -45,8 +43,4 @@ else
     docker build --build-arg PHP_VERSION_TAG=${PHP_VERSION}-apache -f ${DOCKERFILE_PATH} -t ${DOCKER_REPO}:${PHP_VERSION}-${DOCKER_TAG} .
   done
 
-  #docker build --build-arg PHP_VERSION_TAG=7.1-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.1-$DOCKER_TAG .
-  #docker build --build-arg PHP_VERSION_TAG=7.2-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.2-$DOCKER_TAG .
-  #docker build --build-arg PHP_VERSION_TAG=7.3-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.3-$DOCKER_TAG .
-  #docker build --build-arg PHP_VERSION_TAG=7.4-apache -f $DOCKERFILE_PATH -t $DOCKER_REPO:7.4-$DOCKER_TAG .
 fi

hooks/post_push

@@ -18,13 +18,9 @@ if [ $DOCKER_TAG == "latest" ]; then
 
   for PHP_VERSION in $(echo "$PHP_TAGS"); do
     echo "##### Push $PHP_VERSION (x.y.z) #####"
-    docker push ${DOCKER_REPO}:${PHP_VERSION}
+    docker push ${DOCKER_REPO}:${PHP_VERSION}-latest
   done
 
-  #docker push $DOCKER_REPO:7.1-latest
-  #docker push $DOCKER_REPO:7.2-latest
-  #docker push $DOCKER_REPO:7.3-latest
-  #docker push $DOCKER_REPO:7.4-latest
 else
 
   for PHP_MAJOR in $(echo "$PHP_TAGS" | grep -Po "^[0-9]+" | sort | uniq); do
@@ -42,8 +38,4 @@ else
     docker push ${DOCKER_REPO}:${PHP_VERSION}-${DOCKER_TAG}
   done
 
-  #docker push $DOCKER_REPO:7.1-$DOCKER_TAG
-  #docker push $DOCKER_REPO:7.2-$DOCKER_TAG
-  #docker push $DOCKER_REPO:7.3-$DOCKER_TAG
-  #docker push $DOCKER_REPO:7.4-$DOCKER_TAG
 fi