diff --git a/Jenkinsfile b/Jenkinsfile index 15bba7f1a6..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 @@ -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..c530f2626d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,18 +1,17 @@ -FROM eclipsecbi/fedora-gtk3-mutter:41-gtk3.24 +FROM eclipsecbi/fedora-gtk3-mutter:42-gtk3.24 # Back to root for install 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 -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