Skip to content

Jenkins lts upgrade #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jburel merged 9 commits into from
Dec 18, 2025
Merged

Jenkins lts upgrade #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e254c23
Bump to lts-jdk17
jburel Dec 16, 2025
3a5d083
Use Label instead of Maintainer (deprecated)
jburel Dec 17, 2025
82b6566
Use jdk21
jburel Dec 17, 2025
36608f4
Disable test-folder job
jburel Dec 17, 2025
c21c920
Remove grunt
jburel Dec 17, 2025
d39c89e
Bump openmicroscopy/devagent to 0.8.2
jburel Dec 17, 2025
be83f9a
Use 0.8.2
jburel Dec 17, 2025
8fd3096
Set the java version
jburel Dec 17, 2025
d4e3d8f
Use label instead of maintainer
jburel Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion home/jobs/Trigger/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
4 changes: 2 additions & 2 deletions jenkins/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 4 additions & 6 deletions server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down
7 changes: 5 additions & 2 deletions slave/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
7 changes: 2 additions & 5 deletions web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down