update nodejs to latest stable v26 (from v20)

Author: ralfbecker

doc/docker/development/Dockerfile

@@ -4,7 +4,7 @@
 ##
 ################################################################################
 ARG ARCH=
-FROM ${ARCH}node:20-bookworm-slim
+FROM ${ARCH}node:26-bookworm-slim
 LABEL maintainer="rb@egroupware.org"
 
 ARG VERSION=dev-master

doc/docker/fpm/Dockerfile

@@ -1,6 +1,6 @@
 ################################################################################
 ##
-## EGroupware FPM container using Ubuntu 20.04, NodeJS 20 and PHP 8.4 from ondrej/php PPA
+## EGroupware FPM container using Ubuntu 20.04, NodeJS 26 and PHP 8.5 from ondrej/php PPA
 ##
 ################################################################################
 ARG ARCH=
@@ -86,15 +86,15 @@ RUN set -e \
 	&& rm -f /usr/local/bin/composer.phar
 RUN set -e \
 	&& cd /usr/share/egroupware \
-	# install nodejs 20.x (Shoelace requires >= 14.17, Ubuntu 22.04 only has 12.x) \
+	# install nodejs 26.x (Shoelace requires >= 14.17, Ubuntu 22.04 only has 12.x) \
 	&& if [ "$TARGETPLATFORM" = "linux/ppc64le" ]; then \
-        dist_node_v20=https://nodejs.org/dist/latest-v20.x/ \
-        dist_node_v20_ppc64le=$(curl $dist_node_v20|grep ppc64le.tar.xz|cut -d'"' -f2) \
-        curl -L $dist_node_v20$dist_node_v20_ppc64le | tar --directory=/usr/local/ -xJvf - ; \
+        dist_node_v26=https://nodejs.org/dist/latest-v26.x/ \
+        dist_node_v26_ppc64le=$(curl $dist_node_v26|grep ppc64le.tar.xz|cut -d'"' -f2) \
+        curl -L $dist_node_v26$dist_node_v26_ppc64le | tar --directory=/usr/local/ -xJvf - ; \
     else \
     	mkdir -p /etc/apt/keyrings \
         && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
-        && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+        && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_26.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
         && apt-get update \
         && apt-get install -y nodejs libatomic1 ; \
     fi \

doc/docker/fpm/build.sh

@@ -23,6 +23,7 @@ BRANCH=$(echo $VERSION|sed 's/\..*$//')
 [ $BRANCH = "23" ] && {
   BRANCH=23.1
   DEFAULT_PHP_VERSION=8.4
+  PHP_VERSION=$DEFAULT_PHP_VERSION
 }
 [ $VERSION = $BRANCH ] && VERSION="dev-$BRANCH"
 
@@ -43,13 +44,14 @@ docker pull $BASE
 
 # add further tags for default PHP version only
 [ $PHP_VERSION = $DEFAULT_PHP_VERSION -a "$BRANCH" != $VERSION -a "dev-${BRANCH}" != $VERSION ] && {
-  extra_tags="--tag egroupware/egroupware:latest --tag egroupware/egroupware:$BRANCH"
+  #extra_tags="--tag egroupware/egroupware:latest --tag egroupware/egroupware:$BRANCH"
+  extra_tags="--tag egroupware/egroupware:$BRANCH"
 }
 
 if docker buildx 2>&1 >/dev/null
 then
   # buildx available --> build a multi-platform image and push it for all tags
-  docker buildx build --push --platform $PLATFORMS --build-arg "VERSION=$VERSION" --build-arg "PHP_VERSION=$PHP_VERSION" --tag egroupware/egroupware:$TAG $extra_tags .
+  docker buildx build --no-cache --push --platform $PLATFORMS --build-arg "VERSION=$VERSION" --build-arg "PHP_VERSION=$PHP_VERSION" --tag egroupware/egroupware:$TAG $extra_tags .
 else
   # no buildx, eg. on dev only builds amd64!
   docker build --build-arg "VERSION=$VERSION" --build-arg "PHP_VERSION=$PHP_VERSION" --tag egroupware/egroupware:$TAG . && {