From e254c2323b5a9fe7cb476b84bb478b03ef85bbde Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Tue, 16 Dec 2025 16:03:44 +0000 Subject: [PATCH 1/9] Bump to lts-jdk17 --- jenkins/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 3964a0d7..c01c0484 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,4 +1,4 @@ -FROM jenkins/jenkins:2.426.3 +FROM jenkins/jenkins:lts-jdk17 MAINTAINER OME # Temp fix robot test results From 3a5d083de595fd71bae3f4eba14a87177a6b3c81 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 08:03:21 +0000 Subject: [PATCH 2/9] Use Label instead of Maintainer (deprecated) --- docker/Dockerfile | 2 +- jenkins/Dockerfile | 2 +- server/Dockerfile | 2 +- slave/Dockerfile | 6 +++++- web/Dockerfile | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 4b6d82ae..304075f3 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM openmicroscopy/devagent:0.8.1 -MAINTAINER OME +LABEL org.opencontainers.image.authors="OME" USER root diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index c01c0484..220bda1d 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,5 +1,5 @@ FROM jenkins/jenkins:lts-jdk17 -MAINTAINER OME +LABEL OME # Temp fix robot test results ENV JAVA_OPTS "-Dhudson.model.DirectoryBrowserSupport.CSP=" -Djenkins.install.runSetupWizard=false diff --git a/server/Dockerfile b/server/Dockerfile index d13129e2..3d5efef4 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,6 +1,6 @@ FROM openmicroscopy/devagent:0.8.1 -MAINTAINER OME +LABEL org.opencontainers.image.authors="OME" ADD ./settings.env /home/settings.env diff --git a/slave/Dockerfile b/slave/Dockerfile index 9ac6298a..6f002933 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -1,6 +1,6 @@ FROM openmicroscopy/devagent:0.8.1 -MAINTAINER OME +LABEL org.opencontainers.image.authors="OME" ARG NAME=ome @@ -62,6 +62,10 @@ RUN dnf -y install epel-release RUN dnf -y update RUN dnf -y install blosc +# install various Java versions +RUN dnf install -y java-21-openjdk-devel java-17-openjdk-devel +RUN dnf install -y cronie + EXPOSE 14064 EXPOSE 14063 diff --git a/web/Dockerfile b/web/Dockerfile index 9d807f98..dea896b4 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,6 +1,6 @@ FROM openmicroscopy/devagent:0.8.1 -MAINTAINER OME +LABEL org.opencontainers.image.authors="OME" ADD ./settings.env /home/settings.env RUN chmod +x /home/settings.env From 82b6566acb257f9068047e37427bcd07fe617d2d Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 08:03:55 +0000 Subject: [PATCH 3/9] Use jdk21 --- jenkins/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 220bda1d..b48f1938 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -1,5 +1,5 @@ -FROM jenkins/jenkins:lts-jdk17 -LABEL OME +FROM jenkins/jenkins:lts-jdk21 +LABEL org.opencontainers.image.authors="OME" # Temp fix robot test results ENV JAVA_OPTS "-Dhudson.model.DirectoryBrowserSupport.CSP=" -Djenkins.install.runSetupWizard=false From 36608f48d5ac2f9b0df99acacda6675e6c93f5a4 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 10:28:19 +0000 Subject: [PATCH 4/9] Disable test-folder job --- home/jobs/Trigger/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/jobs/Trigger/config.xml b/home/jobs/Trigger/config.xml index 60c2aed1..93f10fef 100644 --- a/home/jobs/Trigger/config.xml +++ b/home/jobs/Trigger/config.xml @@ -56,7 +56,7 @@ build job: 'BIOFORMATS-build' build job: 'BIOFORMATS-image' build job: 'BIOFORMATS-linkcheck', wait: false, propagate: false - build job: 'BIOFORMATS-test-repo', wait: false, propagate: false + // build job: 'BIOFORMATS-test-repo', wait: false, propagate: false } } From c21c920e595b4cdbbac5e29a876a60836276c26b Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 10:28:30 +0000 Subject: [PATCH 5/9] Remove grunt --- web/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/Dockerfile b/web/Dockerfile index dea896b4..0de79ada 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -9,9 +9,6 @@ RUN chmod +x /home/settings.env RUN dnf -y install ant make RUN curl -sL https://rpm.nodesource.com/setup_20.x | bash RUN dnf install -y nodejs -# grunt for figure -RUN npm install -g grunt - EXPOSE 4080 From d39c89ed4ff917d0ca5b380cfd0c375c12f622cf Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 14:31:22 +0000 Subject: [PATCH 6/9] Bump openmicroscopy/devagent to 0.8.2 --- docker/Dockerfile | 2 +- server/Dockerfile | 6 +----- slave/Dockerfile | 4 +--- web/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 304075f3..c7d3a8b1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devagent:0.8.1 +FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" diff --git a/server/Dockerfile b/server/Dockerfile index 3d5efef4..999f5128 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devagent:0.8.1 +FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" @@ -38,10 +38,6 @@ RUN dnf -y install epel-release RUN dnf -y update RUN dnf -y install blosc -# install various Java versions -RUN dnf install -y java-21-openjdk-devel java-17-openjdk-devel -RUN dnf install -y cronie - # Add cron job to rotate java versions ADD ./root /var/spool/cron/ RUN chmod +x /var/spool/cron/root diff --git a/slave/Dockerfile b/slave/Dockerfile index 6f002933..1f833e00 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devagent:0.8.1 +FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" @@ -62,8 +62,6 @@ RUN dnf -y install epel-release RUN dnf -y update RUN dnf -y install blosc -# install various Java versions -RUN dnf install -y java-21-openjdk-devel java-17-openjdk-devel RUN dnf install -y cronie EXPOSE 14064 diff --git a/web/Dockerfile b/web/Dockerfile index 0de79ada..12ce2f84 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devagent:0.8.1 +FROM openmicroscopy/devagent:0.8.2 LABEL org.opencontainers.image.authors="OME" From be83f9a084a924b360c87ff8926ab31249e1764c Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 17:36:30 +0000 Subject: [PATCH 7/9] Use 0.8.2 --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 1bbbf2a5..32ab8ff8 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM openmicroscopy/devagent:0.8.1 +FROM openmicroscopy/devagent:0.8.2 MAINTAINER OME From 8fd30962a487642343f1565d02014e8d65b8742e Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 17:36:45 +0000 Subject: [PATCH 8/9] Set the java version --- server/Dockerfile | 2 ++ slave/Dockerfile | 1 + 2 files changed, 3 insertions(+) diff --git a/server/Dockerfile b/server/Dockerfile index 999f5128..f1f63afd 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -43,6 +43,8 @@ ADD ./root /var/spool/cron/ RUN chmod +x /var/spool/cron/root +RUN update-alternatives --set java java-11-openjdk.x86_64 + EXPOSE 4064 EXPOSE 4063 diff --git a/slave/Dockerfile b/slave/Dockerfile index 1f833e00..9a3bae8a 100644 --- a/slave/Dockerfile +++ b/slave/Dockerfile @@ -63,6 +63,7 @@ RUN dnf -y update RUN dnf -y install blosc RUN dnf install -y cronie +RUN update-alternatives --set java java-11-openjdk.x86_64 EXPOSE 14064 EXPOSE 14063 From d4e3d8f500a4c7dca86a9749f09595a8b2cb7a4b Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 17 Dec 2025 17:37:43 +0000 Subject: [PATCH 9/9] Use label instead of maintainer --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 32ab8ff8..6b538923 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,6 +1,6 @@ FROM openmicroscopy/devagent:0.8.2 -MAINTAINER OME +LABEL org.opencontainers.image.authors="OME" COPY nginx-stable.repo /etc/yum.repos.d/ RUN dnf -y install dnf-utils