Skip to content

Commit

Permalink
Update JDK patch versions to latest from sdkman (#193)
Browse files Browse the repository at this point in the history 
Signed-off-by: Aurélien Pupier <[email protected]>
  • Loading branch information
@apupier
apupier authored Dec 2, 2024
1 parent e4673da commit 170d300
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ docker run -ti --rm \
|---------------------|-------------------------------------|
|--------JAVA---------|-------------------------------------|
| `sdk` |`<https://get.sdkman.io>` |
| `java` |`<8.0.402-tem via sdkman>` |
| `java` |`<11.0.22-tem via sdkman>` |
| `java` |`<17.0.10-tem via sdkman>/default` |
| `java` |`<21.0.2-tem via sdkman>` |
| `java` |`<8.0.432-tem via sdkman>` |
| `java` |`<11.0.25-tem via sdkman>` |
| `java` |`<17.0.13-tem via sdkman>/default` |
| `java` |`<21.0.5-tem via sdkman>` |
| `maven` |`<via sdkman>` |
| `gradle` |`<via sdkman>` |
| `mandrel` |`<22.1.2.r21-mandrel via sdkman>` |
Expand Down
22 changes: 11 additions & 11 deletions universal/ubi8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ RUN curl -fsSL "https://get.sdkman.io/?rcupdate=false" | bash \
&& bash -c ". /home/tooling/.sdkman/bin/sdkman-init.sh \
&& sed -i "s/sdkman_auto_answer=false/sdkman_auto_answer=true/g" /home/tooling/.sdkman/etc/config \
&& sed -i "s/sdkman_auto_env=false/sdkman_auto_env=true/g" /home/tooling/.sdkman/etc/config \
&& sdk install java 8.0.402-tem \
&& sdk install java 11.0.22-tem \
&& sdk install java 17.0.10-tem \
&& sdk install java 21.0.2-tem \
&& sdk install java 23.1.2.r21-mandrel \
&& sdk default java 17.0.10-tem \
&& sdk install java 8.0.432-tem \
&& sdk install java 11.0.25-tem \
&& sdk install java 17.0.13-tem \
&& sdk install java 21.0.5-tem \
&& sdk install java 23.1.5.r21-mandrel \
&& sdk default java 17.0.13-tem \
&& sdk install gradle \
&& sdk install maven \
&& sdk install jbang \
Expand All @@ -47,10 +47,10 @@ RUN curl -fsSL "https://get.sdkman.io/?rcupdate=false" | bash \
&& chgrp -R 0 /home/tooling && chmod -R g=u /home/tooling

# sdk home java <version>
ENV JAVA_HOME_8=/home/tooling/.sdkman/candidates/java/8.0.402-tem
ENV JAVA_HOME_11=/home/tooling/.sdkman/candidates/java/11.0.22-tem
ENV JAVA_HOME_17=/home/tooling/.sdkman/candidates/java/17.0.10-tem
ENV JAVA_HOME_21=/home/tooling/.sdkman/candidates/java/21.0.2-tem
ENV JAVA_HOME_8=/home/tooling/.sdkman/candidates/java/8.0.432-tem
ENV JAVA_HOME_11=/home/tooling/.sdkman/candidates/java/11.0.25-tem
ENV JAVA_HOME_17=/home/tooling/.sdkman/candidates/java/17.0.13-tem
ENV JAVA_HOME_21=/home/tooling/.sdkman/candidates/java/21.0.5-tem

# Java-related environment variables are described and set by ${PROFILE_EXT}, which will be loaded by ~/.bashrc
# To make Java working for dash and other shells, it needs to initialize them in the Dockerfile.
Expand All @@ -64,7 +64,7 @@ ENV GRADLE_HOME="/home/tooling/.sdkman/candidates/gradle/current"
ENV JAVA_HOME="/home/tooling/.sdkman/candidates/java/current"
ENV MAVEN_HOME="/home/tooling/.sdkman/candidates/maven/current"

ENV GRAALVM_HOME=/home/tooling/.sdkman/candidates/java/23.1.2.r21-mandrel
ENV GRAALVM_HOME=/home/tooling/.sdkman/candidates/java/23.1.5.r21-mandrel

ENV PATH="/home/tooling/.krew/bin:$PATH"
ENV PATH="/home/tooling/.sdkman/candidates/maven/current/bin:$PATH"
Expand Down
22 changes: 11 additions & 11 deletions universal/ubi9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ RUN curl -fsSL "https://get.sdkman.io/?rcupdate=false" | bash \
&& bash -c ". /home/tooling/.sdkman/bin/sdkman-init.sh \
&& sed -i "s/sdkman_auto_answer=false/sdkman_auto_answer=true/g" /home/tooling/.sdkman/etc/config \
&& sed -i "s/sdkman_auto_env=false/sdkman_auto_env=true/g" /home/tooling/.sdkman/etc/config \
&& sdk install java 8.0.402-tem \
&& sdk install java 11.0.22-tem \
&& sdk install java 17.0.10-tem \
&& sdk install java 21.0.2-tem \
&& sdk install java 23.1.2.r21-mandrel \
&& sdk default java 17.0.10-tem \
&& sdk install java 8.0.432-tem \
&& sdk install java 11.0.25-tem \
&& sdk install java 17.0.13-tem \
&& sdk install java 21.0.5-tem \
&& sdk install java 23.1.5.r21-mandrel \
&& sdk default java 17.0.13-tem \
&& sdk install gradle \
&& sdk install maven \
&& sdk install jbang \
Expand All @@ -47,10 +47,10 @@ RUN curl -fsSL "https://get.sdkman.io/?rcupdate=false" | bash \
&& chgrp -R 0 /home/tooling && chmod -R g=u /home/tooling

# sdk home java <version>
ENV JAVA_HOME_8=/home/tooling/.sdkman/candidates/java/8.0.402-tem
ENV JAVA_HOME_11=/home/tooling/.sdkman/candidates/java/11.0.22-tem
ENV JAVA_HOME_17=/home/tooling/.sdkman/candidates/java/17.0.10-tem
ENV JAVA_HOME_21=/home/tooling/.sdkman/candidates/java/21.0.2-tem
ENV JAVA_HOME_8=/home/tooling/.sdkman/candidates/java/8.0.432-tem
ENV JAVA_HOME_11=/home/tooling/.sdkman/candidates/java/11.0.25-tem
ENV JAVA_HOME_17=/home/tooling/.sdkman/candidates/java/17.0.13-tem
ENV JAVA_HOME_21=/home/tooling/.sdkman/candidates/java/21.0.5-tem

# Java-related environment variables are described and set by ${PROFILE_EXT}, which will be loaded by ~/.bashrc
# To make Java working for dash and other shells, it needs to initialize them in the Dockerfile.
Expand All @@ -64,7 +64,7 @@ ENV GRADLE_HOME="/home/tooling/.sdkman/candidates/gradle/current"
ENV JAVA_HOME="/home/tooling/.sdkman/candidates/java/current"
ENV MAVEN_HOME="/home/tooling/.sdkman/candidates/maven/current"

ENV GRAALVM_HOME=/home/tooling/.sdkman/candidates/java/23.1.2.r21-mandrel
ENV GRAALVM_HOME=/home/tooling/.sdkman/candidates/java/23.1.5.r21-mandrel

ENV PATH="/home/tooling/.krew/bin:$PATH"
ENV PATH="/home/tooling/.sdkman/candidates/maven/current/bin:$PATH"
Expand Down

0 comments on commit 170d300

Please sign in to comment.