From 2b6fc0cb30ffd8d00905a6732a747965894023b1 Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 18:19:15 +0100 Subject: [PATCH 1/7] Add version for stack-build-agent using yarn 4 --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2895d4b..f551305 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -104,6 +104,7 @@ pipeline { buildImage('stack-build-agent', 'h111.3-n18.19-jdk17', 'stack-build-agent', ['JDK_VERSION':'17']) buildImage('stack-build-agent', 'a3.19-h120-n20-jdk17', 'stack-build-agent', ['ALPINE_VERSION':'3.19', 'JDK_VERSION':'17', 'NODE_VERSION':'20.15.1-r0', 'NPM_VERSION':'10.2.5-r0', 'HUGO_VERSION':'0.120.4', 'YARN_VERSION':'1.22.19-r0']) buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.3.0-r1', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) + buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.3.0-r1', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) } } From 9d993083259373d09658880142aa0bec40b4f340 Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 18:41:53 +0100 Subject: [PATCH 2/7] support different ways to install yarn depending on version --- stack-build-agent/Dockerfile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/stack-build-agent/Dockerfile b/stack-build-agent/Dockerfile index 0258185..ccb7ffc 100644 --- a/stack-build-agent/Dockerfile +++ b/stack-build-agent/Dockerfile @@ -26,7 +26,6 @@ RUN apk add --no-cache \ make \ "nodejs=${NODE_VERSION}" \ "npm=${NPM_VERSION}" \ - "yarn=${YARN_VERSION}" \ openjdk${JDK_VERSION}-jdk \ maven \ curl \ @@ -34,6 +33,14 @@ RUN apk add --no-cache \ libc6-compat \ libstdc++ +RUN if [[ "$YARN_VERSION" =~ "1.*" ]]; then \ + apk add --no-cache "yarn=${YARN_VERSION}"; \ + else \ + npm install -g corepack; \ + corepack enable; \ + corepack prepare yarn@${YARN_VERSION} --activate; \ + fi + ENV JAVA_HOME="/usr/lib/jvm/java-${JDK_VERSION}-openjdk" ENV PATH=$PATH:/usr/lib/jvm/java-${JDK_VERSION}-openjdk/bin @@ -42,4 +49,3 @@ RUN curl -L -o /tmp/hugo.tar.gz "https://github.com/gohugoio/hugo/releases/downl && tar -xf "/tmp/hugo.tar.gz" hugo -C /usr/bin USER 10001:0 - From 7fef8cb3e60cf9ac297c3aed04fed387083cbb3a Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 18:47:23 +0100 Subject: [PATCH 3/7] update used npm version --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f551305..269ab44 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,8 +103,8 @@ pipeline { buildImage('stack-build-agent', 'h111.3-n18.19-jdk11', 'stack-build-agent', [:], true) buildImage('stack-build-agent', 'h111.3-n18.19-jdk17', 'stack-build-agent', ['JDK_VERSION':'17']) buildImage('stack-build-agent', 'a3.19-h120-n20-jdk17', 'stack-build-agent', ['ALPINE_VERSION':'3.19', 'JDK_VERSION':'17', 'NODE_VERSION':'20.15.1-r0', 'NPM_VERSION':'10.2.5-r0', 'HUGO_VERSION':'0.120.4', 'YARN_VERSION':'1.22.19-r0']) - buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.3.0-r1', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) - buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.3.0-r1', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) + buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) + buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) } } From 93cad82c1c35e0863decf9c63d48bf473420bb4d Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 18:51:56 +0100 Subject: [PATCH 4/7] sync build.sh with Jenkinsfile --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index cc62e55..c81661d 100755 --- a/build.sh +++ b/build.sh @@ -40,7 +40,8 @@ build_arg drupal-node d11.1.3-n22.14.0 "--build-arg DRUPAL_VERSION=11.1.3 --buil build_arg stack-build-agent h111.3-n18.17-jdk11 "" latest build_arg stack-build-agent h111.3-n18.17-jdk17 "--build-arg JDK_VERSION=17" build_arg stack-build-agent a3.19-h120-n20-jdk17 "--build-arg ALPINE_VERSION=3.19 --build-arg JDK_VERSION=17 --build-arg NODE_VERSION=20.15.1-r0 --build-arg NPM_VERSION=10.2.5-r0 --build-arg HUGO_VERSION=0.120.4 --build-arg YARN_VERSION=1.22.19-r0" -build_arg stack-build-agent a3.22-h144-n22-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.3.0-r1 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=1.22.22-r1" +build_arg stack-build-agent a3.22-h144-n22-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=1.22.22-r1" +build_arg stack-build-agent a3.22-h144-n22-y412-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=4.12.0" ## Used for native builds build_arg native-build-agent jdk21-n22 "--build-arg NODE_VERSION=v22.17.0" latest From b066c07cfd7d0fb41e0361ebe0efd79d4fe8f32a Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 18:56:01 +0100 Subject: [PATCH 5/7] update to available maven version 3.9.12 --- native-build-agent/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native-build-agent/Dockerfile b/native-build-agent/Dockerfile index 08b0c8a..221c8b0 100644 --- a/native-build-agent/Dockerfile +++ b/native-build-agent/Dockerfile @@ -17,7 +17,7 @@ ARG JAVA_VERSION=21 FROM quay.io/quarkus/ubi9-quarkus-mandrel-builder-image:jdk-${JAVA_VERSION} ARG NODE_VERSION=v22.14.0 -ARG MVN_VERSION=3.9.11 +ARG MVN_VERSION=3.9.12 USER root From 8f2b0b568051293fa21f1dd4da829a1ce29727ac Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 19:04:04 +0100 Subject: [PATCH 6/7] update node --- Jenkinsfile | 4 ++-- build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 269ab44..b758e99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,8 +103,8 @@ pipeline { buildImage('stack-build-agent', 'h111.3-n18.19-jdk11', 'stack-build-agent', [:], true) buildImage('stack-build-agent', 'h111.3-n18.19-jdk17', 'stack-build-agent', ['JDK_VERSION':'17']) buildImage('stack-build-agent', 'a3.19-h120-n20-jdk17', 'stack-build-agent', ['ALPINE_VERSION':'3.19', 'JDK_VERSION':'17', 'NODE_VERSION':'20.15.1-r0', 'NPM_VERSION':'10.2.5-r0', 'HUGO_VERSION':'0.120.4', 'YARN_VERSION':'1.22.19-r0']) - buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) - buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) + buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.22.0-r0', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) + buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.22.0-r0', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) } } diff --git a/build.sh b/build.sh index c81661d..2e80554 100755 --- a/build.sh +++ b/build.sh @@ -40,8 +40,8 @@ build_arg drupal-node d11.1.3-n22.14.0 "--build-arg DRUPAL_VERSION=11.1.3 --buil build_arg stack-build-agent h111.3-n18.17-jdk11 "" latest build_arg stack-build-agent h111.3-n18.17-jdk17 "--build-arg JDK_VERSION=17" build_arg stack-build-agent a3.19-h120-n20-jdk17 "--build-arg ALPINE_VERSION=3.19 --build-arg JDK_VERSION=17 --build-arg NODE_VERSION=20.15.1-r0 --build-arg NPM_VERSION=10.2.5-r0 --build-arg HUGO_VERSION=0.120.4 --build-arg YARN_VERSION=1.22.19-r0" -build_arg stack-build-agent a3.22-h144-n22-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=1.22.22-r1" -build_arg stack-build-agent a3.22-h144-n22-y412-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=4.12.0" +build_arg stack-build-agent a3.22-h144-n22-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.22.0-r0 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=1.22.22-r1" +build_arg stack-build-agent a3.22-h144-n22-y412-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.22.0-r0 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=4.12.0" ## Used for native builds build_arg native-build-agent jdk21-n22 "--build-arg NODE_VERSION=v22.17.0" latest From ccac3ec83f38aafa8fd7fb7d607e8761f2ccf755 Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Fri, 13 Feb 2026 19:09:30 +0100 Subject: [PATCH 7/7] fix node and npm again --- Jenkinsfile | 4 ++-- build.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b758e99..f551305 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,8 +103,8 @@ pipeline { buildImage('stack-build-agent', 'h111.3-n18.19-jdk11', 'stack-build-agent', [:], true) buildImage('stack-build-agent', 'h111.3-n18.19-jdk17', 'stack-build-agent', ['JDK_VERSION':'17']) buildImage('stack-build-agent', 'a3.19-h120-n20-jdk17', 'stack-build-agent', ['ALPINE_VERSION':'3.19', 'JDK_VERSION':'17', 'NODE_VERSION':'20.15.1-r0', 'NPM_VERSION':'10.2.5-r0', 'HUGO_VERSION':'0.120.4', 'YARN_VERSION':'1.22.19-r0']) - buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.22.0-r0', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) - buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.22.0-r0', 'NPM_VERSION':'11.6.4-r0', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) + buildImage('stack-build-agent', 'a3.22-h144-n22-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.3.0-r1', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'1.22.22-r1']) + buildImage('stack-build-agent', 'a3.22-h144-n22-y412-jdk21', 'stack-build-agent', ['ALPINE_VERSION':'3.22', 'JDK_VERSION':'21', 'NODE_VERSION':'22.16.0-r2', 'NPM_VERSION':'11.3.0-r1', 'HUGO_VERSION':'0.144.2', 'YARN_VERSION':'4.12.0']) } } diff --git a/build.sh b/build.sh index 2e80554..ff2a232 100755 --- a/build.sh +++ b/build.sh @@ -40,8 +40,8 @@ build_arg drupal-node d11.1.3-n22.14.0 "--build-arg DRUPAL_VERSION=11.1.3 --buil build_arg stack-build-agent h111.3-n18.17-jdk11 "" latest build_arg stack-build-agent h111.3-n18.17-jdk17 "--build-arg JDK_VERSION=17" build_arg stack-build-agent a3.19-h120-n20-jdk17 "--build-arg ALPINE_VERSION=3.19 --build-arg JDK_VERSION=17 --build-arg NODE_VERSION=20.15.1-r0 --build-arg NPM_VERSION=10.2.5-r0 --build-arg HUGO_VERSION=0.120.4 --build-arg YARN_VERSION=1.22.19-r0" -build_arg stack-build-agent a3.22-h144-n22-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.22.0-r0 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=1.22.22-r1" -build_arg stack-build-agent a3.22-h144-n22-y412-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.22.0-r0 --build-arg NPM_VERSION=11.6.4-r0 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=4.12.0" +build_arg stack-build-agent a3.22-h144-n22-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.3.0-r1 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=1.22.22-r1" +build_arg stack-build-agent a3.22-h144-n22-y412-jdk21 "--build-arg ALPINE_VERSION=3.22 --build-arg JDK_VERSION=21 --build-arg NODE_VERSION=22.16.0-r2 --build-arg NPM_VERSION=11.3.0-r1 --build-arg HUGO_VERSION=0.144.2 --build-arg YARN_VERSION=4.12.0" ## Used for native builds build_arg native-build-agent jdk21-n22 "--build-arg NODE_VERSION=v22.17.0" latest