Skip to content

Optional installation of the JVM 21 #647

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
alexanderM91 merged 1 commit into from
Aug 10, 2026
Merged

Optional installation of the JVM 21 #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions images/common/services/jenkins/export/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,23 @@ RUN bash -c 'if [ ! -z "$(which apk)" ]; then apk --no-cache add \
curl \
bash \
openjdk17 \
openjdk21 \
ttf-dejavu \
gettext \
jq \
ca-certificates \
java-cacerts && \
if [ -n "$(apk --no-cache search -q -e openjdk21)" ]; then \
apk --no-cache add openjdk21; \
else \
echo "WARNING: openjdk21 is not available in this Alpine release, skipping it."; \
fi && \
update-ca-certificates && \
ln -sfn "/usr/lib/jvm/java-${SPRYKER_JENKINS_OPENJDK_VERSION}-openjdk" /usr/lib/jvm/default-jvm && \
JVM_HOME="/usr/lib/jvm/java-${SPRYKER_JENKINS_OPENJDK_VERSION}-openjdk"; \
if [ ! -d "$JVM_HOME" ]; then \
echo "WARNING: ${JVM_HOME} is not installed, falling back to java-17-openjdk."; \
JVM_HOME="/usr/lib/jvm/java-17-openjdk"; \
fi && \
ln -sfn "$JVM_HOME" /usr/lib/jvm/default-jvm && \
mkdir -p /envs \
; fi'

Expand All @@ -39,12 +48,17 @@ RUN bash -c 'if [ ! -z "$(which apt)" ]; then apt update -y && \
curl \
bash \
openjdk-17-jdk \
temurin-21-jdk \
fonts-dejavu \
gettext \
jq \
&& \
update-alternatives --set java "$(update-alternatives --list java | grep -m1 -- "-${SPRYKER_JENKINS_OPENJDK_VERSION}-")" && \
(apt install -y temurin-21-jdk || echo "WARNING: temurin-21-jdk is not available, skipping it.") && \
JAVA_ALTERNATIVE="$(update-alternatives --list java | grep -m1 -- "-${SPRYKER_JENKINS_OPENJDK_VERSION}-")"; \
if [ -z "$JAVA_ALTERNATIVE" ]; then \
echo "WARNING: java ${SPRYKER_JENKINS_OPENJDK_VERSION} is not installed, falling back to java 17."; \
JAVA_ALTERNATIVE="$(update-alternatives --list java | grep -m1 -- "-17-")"; \
fi && \
update-alternatives --set java "$JAVA_ALTERNATIVE" && \
mkdir -p /envs \
; fi'

Expand Down
22 changes: 18 additions & 4 deletions images/common/services/jenkins/export/sso/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,24 @@ RUN bash -c 'if [ ! -z "$(which apk)" ]; then apk --no-cache add \
curl \
bash \
openjdk17 \
openjdk21 \
ttf-dejavu \
gettext \
jq \
ca-certificates \
java-cacerts \
aws-cli && \
if [ -n "$(apk --no-cache search -q -e openjdk21)" ]; then \
apk --no-cache add openjdk21; \
else \
echo "WARNING: openjdk21 is not available in this Alpine release, skipping it."; \
fi && \
update-ca-certificates && \
ln -sfn "/usr/lib/jvm/java-${SPRYKER_JENKINS_OPENJDK_VERSION}-openjdk" /usr/lib/jvm/default-jvm && \
JVM_HOME="/usr/lib/jvm/java-${SPRYKER_JENKINS_OPENJDK_VERSION}-openjdk"; \
if [ ! -d "$JVM_HOME" ]; then \
echo "WARNING: ${JVM_HOME} is not installed, falling back to java-17-openjdk."; \
JVM_HOME="/usr/lib/jvm/java-17-openjdk"; \
fi && \
ln -sfn "$JVM_HOME" /usr/lib/jvm/default-jvm && \
mkdir -p /envs \
; fi'

Expand All @@ -45,13 +54,18 @@ RUN bash -c 'if [ ! -z "$(which apt)" ]; then apt update -y && \
curl \
bash \
openjdk-17-jdk \
temurin-21-jdk \
fonts-dejavu \
gettext \
jq \
ca-certificates \
unzip && \
update-alternatives --set java "$(update-alternatives --list java | grep -m1 -- "-${SPRYKER_JENKINS_OPENJDK_VERSION}-")" && \
(apt install -y temurin-21-jdk || echo "WARNING: temurin-21-jdk is not available, skipping it.") && \
JAVA_ALTERNATIVE="$(update-alternatives --list java | grep -m1 -- "-${SPRYKER_JENKINS_OPENJDK_VERSION}-")"; \
if [ -z "$JAVA_ALTERNATIVE" ]; then \
echo "WARNING: java ${SPRYKER_JENKINS_OPENJDK_VERSION} is not installed, falling back to java 17."; \
JAVA_ALTERNATIVE="$(update-alternatives --list java | grep -m1 -- "-17-")"; \
fi && \
update-alternatives --set java "$JAVA_ALTERNATIVE" && \
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
unzip awscliv2.zip && \
./aws/install && \
Expand Down
Loading