Tag major version builds

Author: mike-potter

Dockerfile

@@ -1,7 +1,6 @@
-ARG CLI_VERSION=2.10
-ARG PHP_VERSION=php7.3
+ARG CLI_VERSION=2.10-php7.3
 # Extend the Docksal CLI per https://docs.docksal.io/stack/extend-images/
-FROM docksal/cli:${CLI_VERSION}-${PHP_VERSION}
+FROM docksal/cli:${CLI_VERSION}
 
 # Puppeteer dependencies taken from https://github.com/alekzonder/docker-puppeteer
 # Install addtional apt packages needed for pa11y and puppeteer

hooks/build

@@ -5,10 +5,4 @@ printenv
 echo "Cur dir"
 pwd
 
-cliVersion="$SOURCE_BRANCH"
-phpVersions="$DOCKERFILE_PATH"
-#docker build \
-#  --build-arg CLI_VERSION=${cliVersion} \
-#  --build-arg PHP_VERSION=${phpVersion} \
-#  -t $IMAGE_NAME \
-#  .
+docker build --build-arg CLI_VERSION=$DOCKER_TAG -f $DOCKERFILE_PATH -t $IMAGE_NAME .

hooks/post_push

@@ -3,11 +3,9 @@
 echo "Post Push"
 printenv
 
-# Parse image name for repo name
-tagStart=$(expr index "$IMAGE_NAME" :)
-repoName=${IMAGE_NAME:0:tagStart-1}
-tag="test"
+shortVersion=${SOURCE_BRANCH%.*-php*}
+phpVersion=${SOURCE_BRANCH#*-}
+tag="${shortVersion}-${phpVersion}"
 
-echo "repoName: $repoName"
-echo docker tag $IMAGE_NAME ${repoName}:${tag}
-echo docker push ${repoName}:${tag}
+docker tag $IMAGE_NAME $DOCKER_REPO:${tag}
+docker push $DOCKER_REPO:${tag}