Update to JRuby commit that includes make #13836
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
make is needed for several dummy gems that do not need to build an extension but still attempt to run a Makefile.
|
Looks like a new Bundler version, released just before the holidays, no longer works on JRuby 9.2. I will look into this. |
|
We are opting to remove the 9.2 images. JRuby 9.2 has not been officially supported for some time, and with new Bundler versions not working anymore it seems like a good time to drop it from the images. |
|
Ok now the failures seem to be some other service going down, a service used to verify the images. I do not see how this could have been related to adding |
JRuby 9.2 has not been supported for some time, but we continued to push the docker images. With Bundler no longer supported on Ruby 2.5 and earlier, now is a good time to drop the images.
headius
force-pushed
the
jruby_add_make
branch
from
439fd25
to
e691fc4
Compare
Diff for e691fc4:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 8d97463..5ab7925 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,29 +1,11 @@
Maintainers: JRuby Admin <admin@jruby.org> (@jruby), Charles Oliver Nutter <headius@headius.com> (@headius), Thomas E Enebo <tom.enebo@gmail.com> (@enebo)
GitRepo: https://github.com/jruby/docker-jruby.git
-GitCommit: e02df860e355676cfca1783cfa10f89e339f5672
+GitCommit: 500a1f58e7ad2be7d2af67f1b480b80ff6517314
Tags: 9-jdk, 9-jdk8, 9.4-jdk, 9.4-jdk8, 9.4.0-jdk, 9.4.0-jdk8, 9.4.0.0-jdk, 9.4.0.0-jdk8
Architectures: amd64, arm64v8
Directory: 9.4/jdk8
-Tags: 9.2, 9.2.21, 9.2-jre, 9.2-jre8, 9.2.21-jre, 9.2.21-jre8, 9.2.21.0, 9.2.21.0-jre, 9.2.21.0-jre8
-Directory: 9.2/jre8
-
-Tags: 9.2-jdk, 9.2-jdk8, 9.2.21-jdk, 9.2.21-jdk8, 9.2.21.0-jdk, 9.2.21.0-jdk8
-Directory: 9.2/jdk8
-
-Tags: 9.2-jdk11, 9.2.21-jdk11, 9.2.21.0-jdk11
-Directory: 9.2/jdk11
-
-Tags: 9.2-jdk17, 9.2.21-jdk17, 9.2.21.0-jdk17
-Directory: 9.2/jdk17
-
-Tags: 9.2-jre11, 9.2.21-jre11, 9.2.21.0-jre11
-Directory: 9.2/jre11
-
-Tags: 9.2-onbuild, 9.2.21-onbuild, 9.2.21.0-onbuild
-Directory: 9.2/onbuild-jdk8
-
Tags: 9.3, 9.3.9, 9.3-jre, 9.3-jre8, 9.3.9-jre, 9.3.9-jre8, 9.3.9.0, 9.3.9.0-jre, 9.3.9.0-jre8
Architectures: amd64, arm64v8
Directory: 9.3/jre8
diff --git a/_bashbrew-list b/_bashbrew-list
index 2c32dc3..257f4f7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,33 +1,6 @@
jruby:9
jruby:9-jdk
jruby:9-jdk8
-jruby:9.2
-jruby:9.2-jdk
-jruby:9.2-jdk8
-jruby:9.2-jdk11
-jruby:9.2-jdk17
-jruby:9.2-jre
-jruby:9.2-jre8
-jruby:9.2-jre11
-jruby:9.2-onbuild
-jruby:9.2.21
-jruby:9.2.21-jdk
-jruby:9.2.21-jdk8
-jruby:9.2.21-jdk11
-jruby:9.2.21-jdk17
-jruby:9.2.21-jre
-jruby:9.2.21-jre8
-jruby:9.2.21-jre11
-jruby:9.2.21-onbuild
-jruby:9.2.21.0
-jruby:9.2.21.0-jdk
-jruby:9.2.21.0-jdk8
-jruby:9.2.21.0-jdk11
-jruby:9.2.21.0-jdk17
-jruby:9.2.21.0-jre
-jruby:9.2.21.0-jre8
-jruby:9.2.21.0-jre11
-jruby:9.2.21.0-onbuild
jruby:9.3
jruby:9.3-jdk
jruby:9.3-jdk8
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index a8a8f97..ec7036b 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,10 +1,4 @@
jruby:9.4.0.0-jdk8
-jruby:9.2.21.0-jre8
-jruby:9.2.21.0-jdk8
-jruby:9.2.21.0-jdk11
-jruby:9.2.21.0-jdk17
-jruby:9.2.21.0-jre11
-jruby:9.2.21.0-onbuild
jruby:9.3.9.0-jre8
jruby:9.3.9.0-jdk8
jruby:9.3.9.0-jdk11
diff --git a/jruby_9.2.21.0-jdk11/Dockerfile b/jruby_9.2.21.0-jdk11/Dockerfile
deleted file mode 100644
index 67257c2..0000000
diff --git a/jruby_9.2.21.0-jdk17/Dockerfile b/jruby_9.2.21.0-jdk17/Dockerfile
deleted file mode 100644
index b66315d..0000000
diff --git a/jruby_9.2.21.0-jdk8/Dockerfile b/jruby_9.2.21.0-jdk8/Dockerfile
deleted file mode 100644
index 59d75a8..0000000
diff --git a/jruby_9.2.21.0-jre11/Dockerfile b/jruby_9.2.21.0-jre11/Dockerfile
deleted file mode 100644
index 4b49bd6..0000000
diff --git a/jruby_9.2.21.0-jre8/Dockerfile b/jruby_9.2.21.0-jre8/Dockerfile
deleted file mode 100644
index 26876ec..0000000
diff --git a/jruby_9.2.21.0-onbuild/Dockerfile b/jruby_9.2.21.0-onbuild/Dockerfile
deleted file mode 100644
index 320215b..0000000
diff --git a/jruby_9.3.9.0-jdk11/Dockerfile b/jruby_9.3.9.0-jdk11/Dockerfile
index 7c58aa9..d713550 100644
--- a/jruby_9.3.9.0-jdk11/Dockerfile
+++ b/jruby_9.3.9.0-jdk11/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jdk-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.3.9.0
ENV JRUBY_SHA256 251e6dd8d1d2f82922c8c778d7857e1bef82fe5ca2cf77bc09356421d0b05ab8
diff --git a/jruby_9.3.9.0-jdk17/Dockerfile b/jruby_9.3.9.0-jdk17/Dockerfile
index b34e7fb..6b68c2a 100644
--- a/jruby_9.3.9.0-jdk17/Dockerfile
+++ b/jruby_9.3.9.0-jdk17/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:17-jdk-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.3.9.0
ENV JRUBY_SHA256 251e6dd8d1d2f82922c8c778d7857e1bef82fe5ca2cf77bc09356421d0b05ab8
diff --git a/jruby_9.3.9.0-jdk8/Dockerfile b/jruby_9.3.9.0-jdk8/Dockerfile
index 3da9e12..1cdaf14 100644
--- a/jruby_9.3.9.0-jdk8/Dockerfile
+++ b/jruby_9.3.9.0-jdk8/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:8-jdk-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.3.9.0
ENV JRUBY_SHA256 251e6dd8d1d2f82922c8c778d7857e1bef82fe5ca2cf77bc09356421d0b05ab8
diff --git a/jruby_9.3.9.0-jre11/Dockerfile b/jruby_9.3.9.0-jre11/Dockerfile
index 2cb817d..c7f514b 100644
--- a/jruby_9.3.9.0-jre11/Dockerfile
+++ b/jruby_9.3.9.0-jre11/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jre-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.3.9.0
ENV JRUBY_SHA256 251e6dd8d1d2f82922c8c778d7857e1bef82fe5ca2cf77bc09356421d0b05ab8
diff --git a/jruby_9.3.9.0-jre8/Dockerfile b/jruby_9.3.9.0-jre8/Dockerfile
index 658ed60..21efdda 100644
--- a/jruby_9.3.9.0-jre8/Dockerfile
+++ b/jruby_9.3.9.0-jre8/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:8-jre-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.3.9.0
ENV JRUBY_SHA256 251e6dd8d1d2f82922c8c778d7857e1bef82fe5ca2cf77bc09356421d0b05ab8
diff --git a/jruby_9.4.0.0-jdk11/Dockerfile b/jruby_9.4.0.0-jdk11/Dockerfile
index dfa5609..7a08a7c 100644
--- a/jruby_9.4.0.0-jdk11/Dockerfile
+++ b/jruby_9.4.0.0-jdk11/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jdk-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.4.0.0
ENV JRUBY_SHA256 897bb8a98ad43adcbf5fd3aa75ec85b3312838c949592ca3f623dc1f569d2870
diff --git a/jruby_9.4.0.0-jdk17/Dockerfile b/jruby_9.4.0.0-jdk17/Dockerfile
index b0609c7..26fc26f 100644
--- a/jruby_9.4.0.0-jdk17/Dockerfile
+++ b/jruby_9.4.0.0-jdk17/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:17-jdk-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.4.0.0
ENV JRUBY_SHA256 897bb8a98ad43adcbf5fd3aa75ec85b3312838c949592ca3f623dc1f569d2870
diff --git a/jruby_9.4.0.0-jdk8/Dockerfile b/jruby_9.4.0.0-jdk8/Dockerfile
index 97c4d02..fac3cd8 100644
--- a/jruby_9.4.0.0-jdk8/Dockerfile
+++ b/jruby_9.4.0.0-jdk8/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:8-jdk-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.4.0.0
ENV JRUBY_SHA256 897bb8a98ad43adcbf5fd3aa75ec85b3312838c949592ca3f623dc1f569d2870
diff --git a/jruby_9.4.0.0-jre11/Dockerfile b/jruby_9.4.0.0-jre11/Dockerfile
index eac8472..b882b12 100644
--- a/jruby_9.4.0.0-jre11/Dockerfile
+++ b/jruby_9.4.0.0-jre11/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:11-jre-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.4.0.0
ENV JRUBY_SHA256 897bb8a98ad43adcbf5fd3aa75ec85b3312838c949592ca3f623dc1f569d2870
diff --git a/jruby_9.4.0.0-jre8/Dockerfile b/jruby_9.4.0.0-jre8/Dockerfile
index a425dfd..6896424 100644
--- a/jruby_9.4.0.0-jre8/Dockerfile
+++ b/jruby_9.4.0.0-jre8/Dockerfile
@@ -1,6 +1,6 @@
FROM eclipse-temurin:8-jre-focal
-RUN apt-get update && apt-get install -y libc6-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y libc6-dev make --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV JRUBY_VERSION 9.4.0.0
ENV JRUBY_SHA256 897bb8a98ad43adcbf5fd3aa75ec85b3312838c949592ca3f623dc1f569d2870Relevant Maintainers: |
|
Repushed last commit and the down service (appears to have been rubygems.org) is now working. Ready to go! |
|
Makes sense, thanks for chasing it! I'll include my standard copy-pasta here to hopefully help ease your mind on the removal:
👍 |
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.
make is needed for several dummy gems that do not need to build an extension but still attempt to run a Makefile.
See jruby/docker-jruby#81