From 35474ca63598001dcc0a155892be97deacd3b108 Mon Sep 17 00:00:00 2001
From: Aleksandar Kurtakov <akurtakov@gmail.com>
Date: Thu, 7 Aug 2025 08:08:11 +0300
Subject: [PATCH 1/2] Update docker image used for build

* Fedora 42
* Maven 3.9.11
* NodeJS 22.18.0
---
 Jenkinsfile       | 2 +-
 docker/Dockerfile | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 15bba7f1a6..fd282a1404 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ kind: Pod
 spec:
   containers:
   - name: container
-    image: docker.io/akurtakov/fedora-gtk3-mutter-java-node:f41-node22
+    image: docker.io/akurtakov/fedora-gtk3-mutter-java-node:f42-node22
     imagePullPolicy: Always
     tty: true
     resources:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 422a66e88c..7867db96fe 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipsecbi/fedora-gtk3-mutter:41-gtk3.24
+FROM eclipsecbi/fedora-gtk3-mutter:42-gtk3.24
 
 # Back to root for install
 USER 0
@@ -8,11 +8,11 @@ RUN dnf -y install nodejs npm
 RUN dnf -y install xz
 RUN dnf -y install procps-ng
 
-RUN curl -L https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz | tar -xzv 
+RUN curl -L https://dlcdn.apache.org/maven/maven-3/3.9.11/binaries/apache-maven-3.9.11-bin.tar.gz | tar -xzv 
 
-RUN curl -L https://nodejs.org/dist/v22.11.0/node-v22.11.0-linux-x64.tar.xz | tar -xJ
+RUN curl -L https://nodejs.org/dist/v22.18.0/node-v22.18.0-linux-x64.tar.xz | tar -xJ
 
-ENV PATH=/apache-maven-3.9.9/bin:/node-v22.11.0-linux-x64/bin:/usr/lib/jvm/java-21/bin:$PATH
+ENV PATH=/apache-maven-3.9.11/bin:/node-v22.18.0-linux-x64/bin:/usr/lib/jvm/java-21/bin:$PATH
 ENV JAVA_HOME=/usr/lib/jvm/java-21
 
 #Back to named user

From c4c33ff14fece0ef60af0d3ef3c2dfc9635801ed Mon Sep 17 00:00:00 2001
From: Aleksandar Kurtakov <akurtakov@gmail.com>
Date: Thu, 7 Aug 2025 09:05:14 +0300
Subject: [PATCH 2/2] Do not install Fedora's nodejs/npm

As upstream one is installed and used after that.
---
 Jenkinsfile       | 2 +-
 docker/Dockerfile | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index fd282a1404..1e5085a641 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
 	}
   agent {
     kubernetes {
-      label 'wildwebdeveloper-buildtest-pod'
+      inheritFrom 'wildwebdeveloper-buildtest-pod'
       defaultContainer 'jnlp'
       yaml """
 apiVersion: v1
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7867db96fe..c530f2626d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,7 +4,6 @@ FROM eclipsecbi/fedora-gtk3-mutter:42-gtk3.24
 USER 0
 RUN dnf -y update && dnf -y install \
 	java-21-openjdk-devel git
-RUN dnf -y install nodejs npm
 RUN dnf -y install xz
 RUN dnf -y install procps-ng