Update to JRuby 9.3 but keep 9.2 support #10943
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
|
I would suggest dropping the deprecated |
|
@tianon Sure, I'll make that change. |
JRuby 9.1 support is no longer provided in this config. onbuild support is dropped for 9.3+ per docker-library#2076.
Diff for 6374e78:diff --git a/_bashbrew-cat b/_bashbrew-cat
index faacf7e..b8ad4be 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,31 +1,36 @@
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: c77be8629e90e0782a41c0ffeb810f02fbf0afc4
+GitCommit: d083a9c13640eba8c135caeefbff3b89350bbede
-Tags: 9-jdk, 9-jdk8, 9.2-jdk, 9.2-jdk8, 9.2.19-jdk, 9.2.19-jdk8, 9.2.19.0-jdk, 9.2.19.0-jdk8
-Directory: 9000/jdk8
+Tags: 9-jdk, 9-jdk8, 9.3-jdk, 9.3-jdk8, 9.3.0-jdk, 9.3.0-jdk8, 9.3.0.0-jdk, 9.3.0.0-jdk8
+Directory: 9.3/jdk8
-Tags: 9-onbuild, 9.2-onbuild, 9.2.19-onbuild, 9.2.19.0-onbuild
-Directory: 9000/onbuild-jdk8
+Tags: 9.2, 9.2.19, 9.2-jre, 9.2-jre8, 9.2.19-jre, 9.2.19-jre8, 9.2.19.0, 9.2.19.0-jre, 9.2.19.0-jre8
+Directory: 9.2/jre8
-Tags: 9.1, 9.1.17, 9.1.17.0, 9.1-jre, 9.1.17-jre, 9.1.17.0-jre
-GitFetch: refs/heads/9.1
-GitCommit: 8bc3fe27670a851953345182fe12f14f5e708383
-Directory: 9000/jre
-
-Tags: 9.1-jdk, 9.1.17-jdk, 9.1.17.0-jdk
-GitFetch: refs/heads/9.1
-GitCommit: 8bc3fe27670a851953345182fe12f14f5e708383
-Directory: 9000/jdk
+Tags: 9.2-jdk, 9.2-jdk8, 9.2.19-jdk, 9.2.19-jdk8, 9.2.19.0-jdk, 9.2.19.0-jdk8
+Directory: 9.2/jdk8
Tags: 9.2-jdk11, 9.2.19-jdk11, 9.2.19.0-jdk11
-Directory: 9000/jdk11
+Directory: 9.2/jdk11
-Tags: 9.2-jdk16, 9.2.19-jdk16, 9.2.19.0-jdk16
-Directory: 9000/jdk16
+Tags: 9.2-jdk17, 9.2.19-jdk17, 9.2.19.0-jdk17
+Directory: 9.2/jdk17
Tags: 9.2-jre11, 9.2.19-jre11, 9.2.19.0-jre11
-Directory: 9000/jre11
+Directory: 9.2/jre11
+
+Tags: 9.2-onbuild, 9.2.19-onbuild, 9.2.19.0-onbuild
+Directory: 9.2/onbuild-jdk8
+
+Tags: 9.3-jdk11, 9.3.0-jdk11, 9.3.0.0-jdk11
+Directory: 9.3/jdk11
+
+Tags: 9.3-jdk17, 9.3.0-jdk17, 9.3.0.0-jdk17
+Directory: 9.3/jdk17
+
+Tags: 9.3-jre11, 9.3.0-jre11, 9.3.0.0-jre11
+Directory: 9.3/jre11
-Tags: latest, 9, 9.2, 9.2.19, 9.2-jre, 9.2-jre8, 9.2.19-jre, 9.2.19-jre8, 9.2.19.0, 9.2.19.0-jre, 9.2.19.0-jre8
-Directory: 9000/jre8
+Tags: latest, 9, 9.3, 9.3.0, 9.3-jre, 9.3-jre8, 9.3.0-jre, 9.3.0-jre8, 9.3.0.0, 9.3.0.0-jre, 9.3.0.0-jre8
+Directory: 9.3/jre8
diff --git a/_bashbrew-list b/_bashbrew-list
index e6e1745..96be99a 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,21 +1,11 @@
jruby:9
jruby:9-jdk
jruby:9-jdk8
-jruby:9-onbuild
-jruby:9.1
-jruby:9.1-jdk
-jruby:9.1-jre
-jruby:9.1.17
-jruby:9.1.17-jdk
-jruby:9.1.17-jre
-jruby:9.1.17.0
-jruby:9.1.17.0-jdk
-jruby:9.1.17.0-jre
jruby:9.2
jruby:9.2-jdk
jruby:9.2-jdk8
jruby:9.2-jdk11
-jruby:9.2-jdk16
+jruby:9.2-jdk17
jruby:9.2-jre
jruby:9.2-jre8
jruby:9.2-jre11
@@ -24,7 +14,7 @@ jruby:9.2.19
jruby:9.2.19-jdk
jruby:9.2.19-jdk8
jruby:9.2.19-jdk11
-jruby:9.2.19-jdk16
+jruby:9.2.19-jdk17
jruby:9.2.19-jre
jruby:9.2.19-jre8
jruby:9.2.19-jre11
@@ -33,9 +23,33 @@ jruby:9.2.19.0
jruby:9.2.19.0-jdk
jruby:9.2.19.0-jdk8
jruby:9.2.19.0-jdk11
-jruby:9.2.19.0-jdk16
+jruby:9.2.19.0-jdk17
jruby:9.2.19.0-jre
jruby:9.2.19.0-jre8
jruby:9.2.19.0-jre11
jruby:9.2.19.0-onbuild
+jruby:9.3
+jruby:9.3-jdk
+jruby:9.3-jdk8
+jruby:9.3-jdk11
+jruby:9.3-jdk17
+jruby:9.3-jre
+jruby:9.3-jre8
+jruby:9.3-jre11
+jruby:9.3.0
+jruby:9.3.0-jdk
+jruby:9.3.0-jdk8
+jruby:9.3.0-jdk11
+jruby:9.3.0-jdk17
+jruby:9.3.0-jre
+jruby:9.3.0-jre8
+jruby:9.3.0-jre11
+jruby:9.3.0.0
+jruby:9.3.0.0-jdk
+jruby:9.3.0.0-jdk8
+jruby:9.3.0.0-jdk11
+jruby:9.3.0.0-jdk17
+jruby:9.3.0.0-jre
+jruby:9.3.0.0-jre8
+jruby:9.3.0.0-jre11
jruby:latest
diff --git a/jruby_9.1.17.0-jdk/Dockerfile b/jruby_9.1.17.0-jdk/Dockerfile
deleted file mode 100644
index fa092c1..0000000
diff --git a/jruby_9.1.17.0-jre/Dockerfile b/jruby_9.1.17.0-jre/Dockerfile
deleted file mode 100644
index 5a0bd3d..0000000
diff --git a/jruby_9.2.19.0-jdk16/Dockerfile b/jruby_9.2.19.0-jdk17/Dockerfile
similarity index 97%
copy from jruby_9.2.19.0-jdk16/Dockerfile
copy to jruby_9.2.19.0-jdk17/Dockerfile
index 9a2cc9a..6776989 100644
--- a/jruby_9.2.19.0-jdk16/Dockerfile
+++ b/jruby_9.2.19.0-jdk17/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:16-jdk-buster
+FROM openjdk:17-jdk-buster
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
diff --git a/jruby_9.2.19.0-jdk11/Dockerfile b/jruby_9.3.0.0-jdk11/Dockerfile
similarity index 91%
copy from jruby_9.2.19.0-jdk11/Dockerfile
copy to jruby_9.3.0.0-jdk11/Dockerfile
index 2f31d77..5453f82 100644
--- a/jruby_9.2.19.0-jdk11/Dockerfile
+++ b/jruby_9.3.0.0-jdk11/Dockerfile
@@ -2,8 +2,8 @@ FROM openjdk:11-jdk-buster
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.19.0
-ENV JRUBY_SHA256 1f74885a2d3fa589fcbeb292a39facf7f86be3eac1ab015e32c65d32acf3f3bf
+ENV JRUBY_VERSION 9.3.0.0
+ENV JRUBY_SHA256 2dc1f85936d3ff3adc20d90e5f4894499c585a7ea5fedec67154e2f9ecb1bc9b
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.2.19.0-jdk16/Dockerfile b/jruby_9.3.0.0-jdk17/Dockerfile
similarity index 89%
rename from jruby_9.2.19.0-jdk16/Dockerfile
rename to jruby_9.3.0.0-jdk17/Dockerfile
index 9a2cc9a..e685ffc 100644
--- a/jruby_9.2.19.0-jdk16/Dockerfile
+++ b/jruby_9.3.0.0-jdk17/Dockerfile
@@ -1,9 +1,9 @@
-FROM openjdk:16-jdk-buster
+FROM openjdk:17-jdk-buster
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.19.0
-ENV JRUBY_SHA256 1f74885a2d3fa589fcbeb292a39facf7f86be3eac1ab015e32c65d32acf3f3bf
+ENV JRUBY_VERSION 9.3.0.0
+ENV JRUBY_SHA256 2dc1f85936d3ff3adc20d90e5f4894499c585a7ea5fedec67154e2f9ecb1bc9b
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.2.19.0-jdk8/Dockerfile b/jruby_9.3.0.0-jdk8/Dockerfile
similarity index 91%
copy from jruby_9.2.19.0-jdk8/Dockerfile
copy to jruby_9.3.0.0-jdk8/Dockerfile
index 70ad64c..5397094 100644
--- a/jruby_9.2.19.0-jdk8/Dockerfile
+++ b/jruby_9.3.0.0-jdk8/Dockerfile
@@ -2,8 +2,8 @@ FROM openjdk:8-jdk
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.19.0
-ENV JRUBY_SHA256 1f74885a2d3fa589fcbeb292a39facf7f86be3eac1ab015e32c65d32acf3f3bf
+ENV JRUBY_VERSION 9.3.0.0
+ENV JRUBY_SHA256 2dc1f85936d3ff3adc20d90e5f4894499c585a7ea5fedec67154e2f9ecb1bc9b
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.2.19.0-jre11/Dockerfile b/jruby_9.3.0.0-jre11/Dockerfile
similarity index 91%
copy from jruby_9.2.19.0-jre11/Dockerfile
copy to jruby_9.3.0.0-jre11/Dockerfile
index f8af512..b1f2106 100644
--- a/jruby_9.2.19.0-jre11/Dockerfile
+++ b/jruby_9.3.0.0-jre11/Dockerfile
@@ -2,8 +2,8 @@ FROM openjdk:11-jre-buster
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.19.0
-ENV JRUBY_SHA256 1f74885a2d3fa589fcbeb292a39facf7f86be3eac1ab015e32c65d32acf3f3bf
+ENV JRUBY_VERSION 9.3.0.0
+ENV JRUBY_SHA256 2dc1f85936d3ff3adc20d90e5f4894499c585a7ea5fedec67154e2f9ecb1bc9b
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.2.19.0-jre8/Dockerfile b/jruby_9.3.0.0-jre8/Dockerfile
similarity index 91%
copy from jruby_9.2.19.0-jre8/Dockerfile
copy to jruby_9.3.0.0-jre8/Dockerfile
index 40118a2..a8ddafa 100644
--- a/jruby_9.2.19.0-jre8/Dockerfile
+++ b/jruby_9.3.0.0-jre8/Dockerfile
@@ -2,8 +2,8 @@ FROM openjdk:8-jre
RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-ENV JRUBY_VERSION 9.2.19.0
-ENV JRUBY_SHA256 1f74885a2d3fa589fcbeb292a39facf7f86be3eac1ab015e32c65d32acf3f3bf
+ENV JRUBY_VERSION 9.3.0.0
+ENV JRUBY_SHA256 2dc1f85936d3ff3adc20d90e5f4894499c585a7ea5fedec67154e2f9ecb1bc9b
RUN mkdir /opt/jruby \
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
|
|
@tianon Looks like we're ready to go again! |
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.
JRuby 9.1 support is no longer provided in this config.