Update JRuby Java 21 images to jammy #16610
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment has been minimized.
This comment has been minimized.
yosifkit
reviewed
Apr 15, 2024
LaurentGoderre
force-pushed
the
jruby-java21
branch
from
09e4c91 to
a257328
Compare
Diff for a257328:diff --git a/_bashbrew-cat b/_bashbrew-cat
index eb121ee..90dd920 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,6 +1,6 @@
Maintainers: JRuby Admin <[email protected]> (@jruby), Charles Oliver Nutter <[email protected]> (@headius), Thomas E Enebo <[email protected]> (@enebo)
GitRepo: https://github.com/jruby/docker-jruby.git
-GitCommit: e98cdf3ca642ea35fdf2002d0603f1c03bd55979
+GitCommit: 6f941176b198e2a462f484dd8105c3055e4de4df
Tags: 9-jdk, 9-jdk8, 9.4-jdk, 9.4-jdk8, 9.4.6-jdk, 9.4.6-jdk8, 9.4.6.0-jdk, 9.4.6.0-jdk8
Architectures: amd64, arm64v8
@@ -22,6 +22,10 @@ Tags: 9.3-jdk17, 9.3.14-jdk17, 9.3.14.0-jdk17
Architectures: amd64, arm64v8
Directory: 9.3/jdk17
+Tags: 9.3-jdk21, 9.3.14-jdk21, 9.3.14.0-jdk21
+Architectures: amd64, arm64v8
+Directory: 9.3/jdk21
+
Tags: 9.3-jre11, 9.3.14-jre11, 9.3.14.0-jre11
Architectures: amd64, arm64v8
Directory: 9.3/jre11
@@ -30,6 +34,10 @@ Tags: 9.3-jre17, 9.3.14-jre17, 9.3.14.0-jre17
Architectures: amd64, arm64v8
Directory: 9.3/jre17
+Tags: 9.3-jre21, 9.3.14-jre21, 9.3.14.0-jre21
+Architectures: amd64, arm64v8
+Directory: 9.3/jre21
+
Tags: 9.4-jdk11, 9.4.6-jdk11, 9.4.6.0-jdk11
Architectures: amd64, arm64v8
Directory: 9.4/jdk11
@@ -38,6 +46,10 @@ Tags: 9.4-jdk17, 9.4.6-jdk17, 9.4.6.0-jdk17
Architectures: amd64, arm64v8
Directory: 9.4/jdk17
+Tags: 9.4-jdk21, 9.4.6-jdk21, 9.4.6.0-jdk21
+Architectures: amd64, arm64v8
+Directory: 9.4/jdk21
+
Tags: 9.4-jre11, 9.4.6-jre11, 9.4.6.0-jre11
Architectures: amd64, arm64v8
Directory: 9.4/jre11
@@ -46,6 +58,10 @@ Tags: 9.4-jre17, 9.4.6-jre17, 9.4.6.0-jre17
Architectures: amd64, arm64v8
Directory: 9.4/jre17
+Tags: 9.4-jre21, 9.4.6-jre21, 9.4.6.0-jre21
+Architectures: amd64, arm64v8
+Directory: 9.4/jre21
+
Tags: latest, 9, 9.4, 9.4.6, 9.4-jre, 9.4-jre8, 9.4.6-jre, 9.4.6-jre8, 9.4.6.0, 9.4.6.0-jre, 9.4.6.0-jre8
Architectures: amd64, arm64v8
Directory: 9.4/jre8
diff --git a/_bashbrew-list b/_bashbrew-list
index 6c7854d..068c211 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,53 +6,65 @@ jruby:9.3-jdk
jruby:9.3-jdk8
jruby:9.3-jdk11
jruby:9.3-jdk17
+jruby:9.3-jdk21
jruby:9.3-jre
jruby:9.3-jre8
jruby:9.3-jre11
jruby:9.3-jre17
+jruby:9.3-jre21
jruby:9.3.14
jruby:9.3.14-jdk
jruby:9.3.14-jdk8
jruby:9.3.14-jdk11
jruby:9.3.14-jdk17
+jruby:9.3.14-jdk21
jruby:9.3.14-jre
jruby:9.3.14-jre8
jruby:9.3.14-jre11
jruby:9.3.14-jre17
+jruby:9.3.14-jre21
jruby:9.3.14.0
jruby:9.3.14.0-jdk
jruby:9.3.14.0-jdk8
jruby:9.3.14.0-jdk11
jruby:9.3.14.0-jdk17
+jruby:9.3.14.0-jdk21
jruby:9.3.14.0-jre
jruby:9.3.14.0-jre8
jruby:9.3.14.0-jre11
jruby:9.3.14.0-jre17
+jruby:9.3.14.0-jre21
jruby:9.4
jruby:9.4-jdk
jruby:9.4-jdk8
jruby:9.4-jdk11
jruby:9.4-jdk17
+jruby:9.4-jdk21
jruby:9.4-jre
jruby:9.4-jre8
jruby:9.4-jre11
jruby:9.4-jre17
+jruby:9.4-jre21
jruby:9.4.6
jruby:9.4.6-jdk
jruby:9.4.6-jdk8
jruby:9.4.6-jdk11
jruby:9.4.6-jdk17
+jruby:9.4.6-jdk21
jruby:9.4.6-jre
jruby:9.4.6-jre8
jruby:9.4.6-jre11
jruby:9.4.6-jre17
+jruby:9.4.6-jre21
jruby:9.4.6.0
jruby:9.4.6.0-jdk
jruby:9.4.6.0-jdk8
jruby:9.4.6.0-jdk11
jruby:9.4.6.0-jdk17
+jruby:9.4.6.0-jdk21
jruby:9.4.6.0-jre
jruby:9.4.6.0-jre8
jruby:9.4.6.0-jre11
jruby:9.4.6.0-jre17
+jruby:9.4.6.0-jre21
jruby:latest
diff --git a/jruby_9.3.14.0-jre17/Dockerfile b/jruby_9.3.14.0-jdk21/Dockerfile
similarity index 97%
copy from jruby_9.3.14.0-jre17/Dockerfile
copy to jruby_9.3.14.0-jdk21/Dockerfile
index 514ff13..9ffc302 100644
--- a/jruby_9.3.14.0-jre17/Dockerfile
+++ b/jruby_9.3.14.0-jdk21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:21-jdk-jammy
RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
diff --git a/jruby_9.3.14.0-jre17/Dockerfile b/jruby_9.3.14.0-jre21/Dockerfile
similarity index 97%
copy from jruby_9.3.14.0-jre17/Dockerfile
copy to jruby_9.3.14.0-jre21/Dockerfile
index 514ff13..d87733b 100644
--- a/jruby_9.3.14.0-jre17/Dockerfile
+++ b/jruby_9.3.14.0-jre21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:21-jre-jammy
RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
diff --git a/jruby_9.4.6.0-jre17/Dockerfile b/jruby_9.4.6.0-jdk21/Dockerfile
similarity index 97%
copy from jruby_9.4.6.0-jre17/Dockerfile
copy to jruby_9.4.6.0-jdk21/Dockerfile
index 07b4d2c..cef8130 100644
--- a/jruby_9.4.6.0-jre17/Dockerfile
+++ b/jruby_9.4.6.0-jdk21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:21-jdk-jammy
RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
diff --git a/jruby_9.4.6.0-jre17/Dockerfile b/jruby_9.4.6.0-jre21/Dockerfile
similarity index 97%
copy from jruby_9.4.6.0-jre17/Dockerfile
copy to jruby_9.4.6.0-jre21/Dockerfile
index 07b4d2c..321821e 100644
--- a/jruby_9.4.6.0-jre17/Dockerfile
+++ b/jruby_9.4.6.0-jre21/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:21-jre-jammy
RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*Relevant Maintainers: |
tianon
approved these changes
Apr 16, 2024
oxpa
pushed a commit
to oxpa/docker-official-images
that referenced
this pull request
Apr 17, 2024
Update JRuby Java 21 images to jammy
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Replaces #16603