From fea44a743dbe6b01e1d8b169279bcb2b8d9ac6fb Mon Sep 17 00:00:00 2001 From: Brent Perteet Date: Thu, 27 Aug 2026 16:22:25 +0000 Subject: [PATCH] chore: upgrade Jenkins and agents to Java 21 --- agents/mcuxpresso/Dockerfile | 2 +- agents/mplabx/Dockerfile | 2 +- controller/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/mcuxpresso/Dockerfile b/agents/mcuxpresso/Dockerfile index 2e0259b..0c66106 100644 --- a/agents/mcuxpresso/Dockerfile +++ b/agents/mcuxpresso/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - openssh-server openjdk-17-jre-headless git make build-essential python3 \ + openssh-server openjdk-21-jre-headless git make build-essential python3 \ curl unzip ca-certificates xz-utils \ # Electron runtime deps: MCUXpressoInstallerCLI ships as an Electron # app and needs these even for headless/CLI use. diff --git a/agents/mplabx/Dockerfile b/agents/mplabx/Dockerfile index 4758751..b3cf83c 100644 --- a/agents/mplabx/Dockerfile +++ b/agents/mplabx/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y --no-install-recommends \ - openssh-server openjdk-17-jre-headless git make build-essential \ + openssh-server openjdk-21-jre-headless git make build-essential \ curl unzip ca-certificates \ libxext6 libxrender1 libxtst6 libxi6 libusb-1.0-0 \ && rm -rf /var/lib/apt/lists/* diff --git a/controller/Dockerfile b/controller/Dockerfile index 4e9dbe8..f418c5c 100644 --- a/controller/Dockerfile +++ b/controller/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:lts-jdk17 +FROM jenkins/jenkins:2.568.2-lts-jdk21 COPY controller/plugins.txt /usr/share/jenkins/ref/plugins.txt RUN jenkins-plugin-cli --plugin-file /usr/share/jenkins/ref/plugins.txt