Update Docker images to Java 25 and Maven 3.9.12 (#1888)
This commit is contained in:
@@ -10,7 +10,7 @@ ENV LC_ALL=C.UTF-8
|
||||
# === INSTALL JDK and Maven ===
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends openjdk-21-jdk \
|
||||
apt-get install -y --no-install-recommends openjdk-25-jdk \
|
||||
# Install utilities required for downloading browsers
|
||||
wget \
|
||||
# Install utilities required for downloading driver
|
||||
@@ -22,13 +22,13 @@ RUN apt-get update && \
|
||||
adduser pwuser
|
||||
|
||||
# Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
|
||||
# Java 21, so we install latest Maven from Apache instead.
|
||||
RUN VERSION=3.9.6 && \
|
||||
# Java 25, so we install latest Maven from Apache instead.
|
||||
RUN VERSION=3.9.12 && \
|
||||
wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
|
||||
ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
|
||||
|
||||
ARG PW_TARGET_ARCH
|
||||
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
|
||||
ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
|
||||
|
||||
# === BAKE BROWSERS INTO IMAGE ===
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ ENV LC_ALL=C.UTF-8
|
||||
# === INSTALL JDK and Maven ===
|
||||
|
||||
RUN apt-get update && \
|
||||
apt-get install -y --no-install-recommends openjdk-21-jdk \
|
||||
apt-get install -y --no-install-recommends openjdk-25-jdk \
|
||||
# Install utilities required for downloading browsers
|
||||
wget \
|
||||
# Install utilities required for downloading driver
|
||||
@@ -22,13 +22,13 @@ RUN apt-get update && \
|
||||
adduser pwuser
|
||||
|
||||
# Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
|
||||
# Java 21, so we install latest Maven from Apache instead.
|
||||
RUN VERSION=3.9.6 && \
|
||||
# Java 25, so we install latest Maven from Apache instead.
|
||||
RUN VERSION=3.9.12 && \
|
||||
wget -O - https://archive.apache.org/dist/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
|
||||
ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
|
||||
|
||||
ARG PW_TARGET_ARCH
|
||||
ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-${PW_TARGET_ARCH}
|
||||
ENV JAVA_HOME=/usr/lib/jvm/java-25-openjdk-${PW_TARGET_ARCH}
|
||||
|
||||
# === BAKE BROWSERS INTO IMAGE ===
|
||||
|
||||
|
||||
Reference in New Issue
Block a user