Skip to content
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

Jump to bottom

Bump Jenkins and Java version #1758

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Bump Jenkins and Java version #1758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0680d4c
Upgrade to Java 21
AlbertoPimpo Jan 27, 2024
393d33a
Bumped version to 2.452.4
AlbertoPimpo Aug 8, 2024
7396448
Upgrade slave image to Java 21
AlbertoPimpo Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions 2/Dockerfile.localdev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ EXPOSE 8080 50000
RUN rm /etc/yum.repos.d/*
COPY contrib/openshift/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
RUN curl http://mirror.centos.org/centos/RPM-GPG-KEY-CentOS-Official -o /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS && \
INSTALL_PKGS="dejavu-sans-fonts rsync gettext git git-lfs tar zip unzip openssl bzip2 java-11-openjdk java-11-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel jq xmlstarlet" && \
INSTALL_PKGS="dejavu-sans-fonts rsync gettext git git-lfs tar zip unzip openssl bzip2 java-21-openjdk java-21-openjdk-devel java-11-openjdk java-11-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel jq xmlstarlet" && \
DISABLES="" && \
yum $DISABLES -y --setopt=tsflags=nodocs --disableplugin=subscription-manager install epel-release && \
yum $DISABLES -y --setopt=tsflags=nodocs --disableplugin=subscription-manager install $INSTALL_PKGS && \
yum update --excludepkgs redhat-release -y && \
rpm -V $INSTALL_PKGS && \
yum clean all && \
alternatives --family java-11 --install /usr/bin/java java /usr/lib/jvm/java-11-openjdk/bin/java 1 && \
alternatives --set java java-11 && \
alternatives --family javac-11 --install /usr/bin/javac javac /usr/lib/jvm/java-11-openjdk/bin/javac 1 && \
alternatives --set javac javac-11 && \
alternatives --family jar-11 --install /usr/bin/jar jar /usr/lib/jvm/java-11-openjdk/bin/jar 1 && \
alternatives --set jar jar-11
alternatives --family java-21 --install /usr/bin/java java /usr/lib/jvm/java-21-openjdk/bin/java 1 && \
alternatives --set java java-21 && \
alternatives --family javac-21 --install /usr/bin/javac javac /usr/lib/jvm/java-21-openjdk/bin/javac 1 && \
alternatives --set javac javac-21 && \
alternatives --family jar-21 --install /usr/bin/jar jar /usr/lib/jvm/java-21-openjdk/bin/jar 1 && \
alternatives --set jar jar-21

COPY ./contrib/openshift /opt/openshift
COPY ./contrib/jenkins /usr/local/bin
Expand Down
14 changes: 7 additions & 7 deletions 2/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ EXPOSE 8080 50000
# /usr/lib64/jenkins will subsequently get redirected to /usr/lib/jenkins; it is confirmed that the 3.7 jenkins RHEL images
# do *NOT* have a /usr/lib64/jenkins path
RUN ln -s /usr/lib/jenkins /usr/lib64/jenkins && \
INSTALL_PKGS="dejavu-sans-fonts wget rsync gettext git git-lfs tar zip unzip openssl bzip2 java-11-openjdk java-11-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel jq glibc-locale-source xmlstarlet glibc-langpack-en" && \
INSTALL_PKGS="dejavu-sans-fonts wget rsync gettext git git-lfs tar zip unzip openssl bzip2 java-21-openjdk java-21-openjdk-devel java-11-openjdk java-11-openjdk-devel java-1.8.0-openjdk java-1.8.0-openjdk-devel jq glibc-locale-source xmlstarlet glibc-langpack-en" && \
yum install -y $INSTALL_PKGS && \
yum update -y && \
rpm -V $INSTALL_PKGS && \
yum clean all && \
localedef -f UTF-8 -i en_US en_US.UTF-8 && \
alternatives --family java-11 --install /usr/bin/java java /usr/lib/jvm/java-11-openjdk/bin/java 1 && \
alternatives --set java java-11 && \
alternatives --family javac-11 --install /usr/bin/javac javac /usr/lib/jvm/java-11-openjdk/bin/javac 1 && \
alternatives --set javac javac-11 && \
alternatives --family jar-11 --install /usr/bin/jar jar /usr/lib/jvm/java-11-openjdk/bin/jar 1 && \
alternatives --set jar jar-11
alternatives --family java-21 --install /usr/bin/java java /usr/lib/jvm/java-21-openjdk/bin/java 1 && \
alternatives --set java java-21 && \
alternatives --family javac-21 --install /usr/bin/javac javac /usr/lib/jvm/java-21-openjdk/bin/javac 1 && \
alternatives --set javac javac-21 && \
alternatives --family jar-21 --install /usr/bin/jar jar /usr/lib/jvm/java-21-openjdk/bin/jar 1 && \
alternatives --set jar jar-21


COPY ./contrib/openshift /opt/openshift
Expand Down
2 changes: 1 addition & 1 deletion 2/contrib/openshift/jenkins-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.440.3
2.462.1
4 changes: 2 additions & 2 deletions slave-base/Dockerfile.localdev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ USER root
# Install headless Java
COPY contrib/openshift/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
RUN curl http://mirror.centos.org/centos-7/7/os/x86_64/RPM-GPG-KEY-CentOS-7 -o /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 && \
INSTALL_PKGS="bc gettext git git-lfs java-11-openjdk-headless java-1.8.0-openjdk-headless lsof rsync tar unzip which zip bzip2 jq" && \
INSTALL_PKGS="bc gettext git git-lfs java-21-openjdk-headless java-11-openjdk-headless java-1.8.0-openjdk-headless lsof rsync tar unzip which zip bzip2 jq" && \
DISABLES="--disablerepo=rhel-server-extras --disablerepo=rhel-server --disablerepo=rhel-fast-datapath --disablerepo=rhel-server-optional --disablerepo=rhel-server-ose --disablerepo=rhel-server-rhscl" && \
yum $DISABLES install -y --setopt=tsflags=nodocs --disableplugin=subscription-manager epel-release && \
yum $DISABLES install -y --setopt=tsflags=nodocs --disableplugin=subscription-manager $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum clean all && \
alternatives --set java java-11-openjdk.x86_64 && \
alternatives --set java java-21-openjdk.x86_64 && \
mkdir -p /home/jenkins && \
chown -R 1001:0 /home/jenkins && \
chmod -R g+w /home/jenkins && \
Expand Down
6 changes: 3 additions & 3 deletions slave-base/Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ ENV HOME=/home/jenkins \

USER root
# Install headless Java
RUN INSTALL_PKGS="glibc-langpack-en bc gettext git git-lfs java-11-openjdk-headless java-1.8.0-openjdk-headless lsof rsync tar unzip which zip bzip2 jq glibc-locale-source" && \
RUN INSTALL_PKGS="glibc-langpack-en bc gettext git git-lfs java-21-openjdk-headless java-11-openjdk-headless java-1.8.0-openjdk-headless lsof rsync tar unzip which zip bzip2 jq glibc-locale-source" && \
yum install -y --setopt=tsflags=nodocs --disableplugin=subscription-manager $INSTALL_PKGS && \
rpm -V $INSTALL_PKGS && \
yum update -y && \
yum clean all && \
localedef -f UTF-8 -i en_US en_US.UTF-8 && \
alternatives --family java-11 --install /usr/bin/java java /usr/lib/jvm/jre-11-openjdk/bin/java 1 && \
alternatives --set java java-11 && \
alternatives --family java-21 --install /usr/bin/java java /usr/lib/jvm/jre-21-openjdk/bin/java 1 && \
alternatives --set java java-21 && \
mkdir -p /home/jenkins && \
chown -R 1001:0 /home/jenkins && \
chmod -R g+w /home/jenkins && \
Expand Down