From c54a536f8a62685e94fca1e7b169f0e222978e6b Mon Sep 17 00:00:00 2001
From: ralf <rb@egroupware.org>
Date: Wed, 11 May 2022 08:46:53 +0200
Subject: [PATCH] setting and tagging PHP 8.1 as default PHP version (for
 development)

---
 doc/docker/development/build.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/doc/docker/development/build.sh b/doc/docker/development/build.sh
index 7c9b34d485..49c524bffb 100755
--- a/doc/docker/development/build.sh
+++ b/doc/docker/development/build.sh
@@ -3,9 +3,9 @@
 REPO=egroupware
 IMAGE=development
 BASE=ubuntu:20.04
-RECOMMENDED_PHP_VERSION=7.4
+RECOMMENDED_PHP_VERSION=8.1
 
-PHP_VERSION=${1:-7.4}
+PHP_VERSION=${1:-8.1}
 
 TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE:$PHP_VERSION -c "apt update && apt search php$PHP_VERSION-fpm" 2>/dev/null|grep php$PHP_VERSION-fpm|sed "s|^php$PHP_VERSION-fpm/focal[^ ]* \([78]\.[0-9]*\.[0-9]*\).*|\1|g")
 test -z "$TAG" && {
@@ -29,15 +29,19 @@ docker pull $BASE
 docker build --build-arg "VERSION=$VERSION" --build-arg="PHP_VERSION=$PHP_VERSION" -t $REPO/$IMAGE:$TAG . && {
 	docker push $REPO/$IMAGE:$TAG
 
-	# tag by major PHP version eg. 7.3
-	docker tag $REPO/$IMAGE:$TAG $REPO/$IMAGE:$PHP_VERSION
-	docker push $REPO/$IMAGE:$PHP_VERSION
+	# tag master by major PHP version eg. 8.1
+	[ $BRANCH = "master" ] && {
+    docker tag $REPO/$IMAGE:$TAG $REPO/$IMAGE:$PHP_VERSION
+    docker push $REPO/$IMAGE:$PHP_VERSION
+  }
 
 	# tag only recommended PHP version as latest and $BRANCH (eg. master)
-	[ $BRANCH = "master" -a $PHP_VERSION = $RECOMMENDED_PHP_VERSION ] && {
-		docker tag $REPO/$IMAGE:$TAG $REPO/$IMAGE:latest
-		docker push $REPO/$IMAGE:latest
+	[ $PHP_VERSION = $RECOMMENDED_PHP_VERSION ] && {
+	  [ $BRANCH = "master" ] && {
+      docker tag $REPO/$IMAGE:$TAG $REPO/$IMAGE:latest
+      docker push $REPO/$IMAGE:latest
+    }
 		docker tag $REPO/$IMAGE:$TAG $REPO/$IMAGE:$BRANCH
 		docker push $REPO/$IMAGE:$BRANCH
 	}
-}
+}
\ No newline at end of file