Merge pull request ome#223 from jburel/jenkins_lts_upragde

Jenkins lts upragde

Author: jburel

docker/Dockerfile

@@ -1,6 +1,6 @@
-FROM openmicroscopy/devagent:0.8.1
+FROM openmicroscopy/devagent:0.8.2
 
-MAINTAINER OME
+LABEL org.opencontainers.image.authors="OME"
 
 USER root
 

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
             }
         }
 

jenkins/Dockerfile

@@ -1,5 +1,5 @@
-FROM jenkins/jenkins:2.426.3
-MAINTAINER 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

nginx/Dockerfile

@@ -1,6 +1,6 @@
-FROM openmicroscopy/devagent:0.8.1
+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

server/Dockerfile

@@ -1,6 +1,6 @@
-FROM openmicroscopy/devagent:0.8.1
+FROM openmicroscopy/devagent:0.8.2
 
-MAINTAINER OME
+LABEL org.opencontainers.image.authors="OME"
 
 
 ADD ./settings.env /home/settings.env
@@ -38,15 +38,13 @@ 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
 
 
+RUN update-alternatives --set java java-11-openjdk.x86_64
+
 EXPOSE 4064
 EXPOSE 4063
 

slave/Dockerfile

@@ -1,6 +1,6 @@
-FROM openmicroscopy/devagent:0.8.1
+FROM openmicroscopy/devagent:0.8.2
 
-MAINTAINER OME
+LABEL org.opencontainers.image.authors="OME"
 
 ARG NAME=ome
 
@@ -62,6 +62,9 @@ RUN dnf -y install epel-release
 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
 

web/Dockerfile

@@ -1,6 +1,6 @@
-FROM openmicroscopy/devagent:0.8.1
+FROM openmicroscopy/devagent:0.8.2
 
-MAINTAINER OME
+LABEL org.opencontainers.image.authors="OME"
 
 ADD ./settings.env  /home/settings.env
 RUN chmod +x /home/settings.env
@@ -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