Skip to content

Commit 945116d

Browse files
committed
* Upgrade ssh-agent to jdk21 for build-node
* Use adoptium repository and temurin packages to install Java 8, 11 and 17
1 parent f2694e2 commit 945116d

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

build/Dockerfile

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
1818
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
1919
# ---------------------------------------------------------------------------
20-
FROM jenkins/ssh-agent:jdk11
20+
FROM jenkins/ssh-agent:jdk21
2121

2222
# ____ ____ ____ ____ _ __ _
2323
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
@@ -89,17 +89,20 @@ RUN apt-get --no-install-recommends -y install libasound2 libdbus-glib-1-2 libgt
8989

9090
WORKDIR /root
9191

92+
# Setup Adoptium repository
93+
RUN apt install -y wget apt-transport-https gnupg
94+
RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
95+
RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
96+
RUN apt update
97+
9298
# Install Java 8
93-
# TODO: Remove once we don't have any Contrib extension using a minimum version of XWiki supporting Java 8.
94-
RUN mkdir -p /usr/lib/jvm && \
95-
wget --no-verbose -O /usr/lib/jvm/java8.tar.gz https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u312-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u312b07.tar.gz && \
96-
tar -C /usr/lib/jvm -xzf /usr/lib/jvm/java8.tar.gz && \
97-
rm /usr/lib/jvm/java8.tar.gz
99+
RUN apt install temurin-8-jdk
100+
101+
# Install Java 11
102+
RUN apt install temurin-11-jdk
98103

99104
# Install Java 17
100-
RUN wget --no-verbose -O /usr/lib/jvm/java17.deb https://download.oracle.com/java/17/archive/jdk-17.0.12_linux-x64_bin.deb && \
101-
apt install /usr/lib/jvm/java17.deb -y && \
102-
rm /usr/lib/jvm/java17.deb
105+
RUN apt install temurin-17-jdk
103106

104107
# Copy VNC config files
105108
COPY vnc/.Xauthority .Xauthority
@@ -124,13 +127,14 @@ RUN wget --no-check-certificate https://archive.apache.org/dist/maven/maven-3/$M
124127
# - Java17 to be available at /home/hudsonagent/java17
125128
# - Java11 to be available at /home/hudsonagent/java11
126129
# - Java8 to be available at /home/hudsonagent/java8
130+
# - Java17 to be available at /home/hudsonagent/java
131+
# - Default java to be /home/hudsonagent/java
127132
# - Maven to be available at /home/hudsonagent/maven
128-
# - Default java to be Java 17
129133
# - "mvn" to be on the path
130134
RUN mkdir -p /home/hudsonagent && \
131-
ln -fs $JAVA_HOME /home/hudsonagent/java11 && \
132-
ln -fs /usr/lib/jvm/jdk-17.0.12-oracle-x64 /home/hudsonagent/java17 && \
133-
ln -fs /usr/lib/jvm/jdk8u312-b07 /home/hudsonagent/java8 && \
135+
ln -fs /usr/lib/jvm/temurin-17-jdk-amd64 /home/hudsonagent/java17 && \
136+
ln -fs /usr/lib/jvm/temurin-11-jdk-amd64/ /home/hudsonagent/java11 && \
137+
ln -fs /usr/lib/jvm/temurin-8-jdk-amd64/ /home/hudsonagent/java8 && \
134138
ln -fs /home/hudsonagent/java17 /home/hudsonagent/java && \
135139
ln -fs /home/hudsonagent/java/bin/java /usr/bin/java && \
136140
ln -fs /root/apache-maven-$MAVEN_VERSION /home/hudsonagent/maven && \

0 commit comments

Comments
 (0)