Merge pull request #2 from scottalan/feature/php74-tag

MASTER :: NOTICKET :: Update Dockerfile to use docksal/cli:2.12-php7.4

Author: tekante

Dockerfile

@@ -1,4 +1,5 @@
-ARG CLI_VERSION=2.10-php7.3
+ARG CLI_VERSION=2.12-php7.4
+
 # Extend the Docksal CLI per https://docs.docksal.io/stack/extend-images/
 FROM docksal/cli:${CLI_VERSION}
 

build.sh

@@ -2,10 +2,16 @@
 
 set -e
 
-CLI_VERSION="2.10"
-for tag in {"php7.2" "php7.3"}; do
+# Arguments: $1 tag, $2 CLI_VERSION
+build() {
   docker build \
-    --build-arg CLI_VERSION="${CLI_VERSION}-${tag}" \
-    -t outrigger/cli:${CLI_VERSION}-${tag} \
+    --build-arg CLI_VERSION="${2}-${1}" \
+    -t outrigger/cli:"${2}-${1}" \
     .
+}
+
+build "php7.2" "2.10"
+
+for tag in "php7.3" "php7.4"; do
+  build $tag "2.12"
 done