Skip to content

Commit a4d9039

Browse files
committed
chore: migrate to temurin jdk/jre
1 parent 6b0af74 commit a4d9039

File tree

4 files changed

+25
-12
lines changed

4 files changed

+25
-12
lines changed

java-base/Dockerfile

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,19 @@ LABEL name="Stackable image for OpenJDK" \
1717
summary="The Stackable OpenJDK base image." \
1818
description="This image is the base image for all Stackable Java product images."
1919

20-
# We need to use EPEL, as openjdk 22 is not shipped with UBI9
21-
RUN rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
20+
RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
21+
[Adoptium]
22+
name=Adoptium
23+
baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/\$releasever/\$basearch
24+
enabled=1
25+
gpgcheck=1
26+
gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
27+
EOF
2228

2329
RUN microdnf update && \
2430
microdnf install \
25-
# Obviously needed to run Java programs
26-
java-${PRODUCT}-openjdk-headless \
31+
# Needed to run Java programs
32+
"temurin-${PRODUCT}-jre" \
2733
# Needed, because otherwise e.g. Zookeeper fails with
2834
# Caused by: java.io.FileNotFoundException: /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat (No such file or directory)
2935
tzdata-java \
@@ -34,7 +40,7 @@ RUN microdnf update && \
3440

3541
COPY java-base/licenses /licenses
3642

37-
ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
43+
ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jre"
3844

3945
# This image doesn't include the development packages for Java.
4046
# For images that need the devel package (ex. Spark) use this env variable to

java-base/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
versions = [
22
{
3-
"product": "1.8.0",
3+
"product": "8",
44
"vector": "0.41.1",
55
},
66
{

java-devel/Dockerfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ FROM stackable/image/stackable-base
99

1010
ARG PRODUCT
1111

12-
# We need to use EPEL, as openjdk 22 is not shipped with UBI9
13-
RUN rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
12+
RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
13+
[Adoptium]
14+
name=Adoptium
15+
baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/\$releasever/\$basearch
16+
enabled=1
17+
gpgcheck=1
18+
gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
19+
EOF
1420

1521
RUN microdnf update && \
1622
microdnf install -y \
@@ -27,9 +33,10 @@ RUN microdnf update && \
2733
gettext \
2834
# For the apply_patches.sh script
2935
git \
30-
# needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
36+
# Needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
3137
hostname \
32-
java-"${PRODUCT}"-openjdk-devel \
38+
# Needed for compiling Java projects
39+
"temurin-${PRODUCT}-jdk" \
3340
krb5-devel \
3441
libcurl-devel \
3542
make \
@@ -46,7 +53,7 @@ RUN microdnf update && \
4653
microdnf clean all && \
4754
rm -rf /var/cache/yum
4855

49-
ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
56+
ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
5057

5158
COPY --chown=stackable:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml
5259

java-devel/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
versions = [
22
{
3-
"product": "1.8.0",
3+
"product": "8",
44
"stackable-base": "1.0.0",
55
},
66
{

0 commit comments

Comments
 (0)