Fix jruby issues #6493
Merged
Fix jruby issues #6493
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
Since the base image no longer provides them.
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 25b14db..93cfc8f 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,46 +1,5 @@
jruby:9.1.17.0-jdk @ amd64
-jruby:9.1.17.0-jdk @ arm32v5
-jruby:9.1.17.0-jdk @ arm64v8
-jruby:9.1.17.0-jdk @ i386
-jruby:9.1.17.0-jdk @ ppc64le
-jruby:9.1.17.0-jdk @ s390x
-jruby:9.1.17.0-jdk-alpine @ amd64
-jruby:9.1.17.0-jdk-alpine @ arm64v8
-jruby:9.1.17.0-jdk-alpine @ ppc64le
-jruby:9.1.17.0-jdk-alpine @ s390x
jruby:9.1.17.0-jre @ amd64
-jruby:9.1.17.0-jre @ arm32v5
-jruby:9.1.17.0-jre @ arm64v8
-jruby:9.1.17.0-jre @ i386
-jruby:9.1.17.0-jre @ ppc64le
-jruby:9.1.17.0-jre @ s390x
-jruby:9.1.17.0-jre-alpine @ amd64
-jruby:9.1.17.0-jre-alpine @ arm64v8
-jruby:9.1.17.0-jre-alpine @ ppc64le
-jruby:9.1.17.0-jre-alpine @ s390x
jruby:9.2.7.0-jdk @ amd64
-jruby:9.2.7.0-jdk @ arm32v5
-jruby:9.2.7.0-jdk @ arm64v8
-jruby:9.2.7.0-jdk @ i386
-jruby:9.2.7.0-jdk @ ppc64le
-jruby:9.2.7.0-jdk @ s390x
-jruby:9.2.7.0-jdk-alpine @ amd64
-jruby:9.2.7.0-jdk-alpine @ arm64v8
-jruby:9.2.7.0-jdk-alpine @ ppc64le
-jruby:9.2.7.0-jdk-alpine @ s390x
jruby:9.2.7.0-jre @ amd64
-jruby:9.2.7.0-jre @ arm32v5
-jruby:9.2.7.0-jre @ arm64v8
-jruby:9.2.7.0-jre @ i386
-jruby:9.2.7.0-jre @ ppc64le
-jruby:9.2.7.0-jre @ s390x
-jruby:9.2.7.0-jre-alpine @ amd64
-jruby:9.2.7.0-jre-alpine @ arm64v8
-jruby:9.2.7.0-jre-alpine @ ppc64le
-jruby:9.2.7.0-jre-alpine @ s390x
jruby:9.2.7.0-onbuild @ amd64
-jruby:9.2.7.0-onbuild @ arm32v5
-jruby:9.2.7.0-onbuild @ arm64v8
-jruby:9.2.7.0-onbuild @ i386
-jruby:9.2.7.0-onbuild @ ppc64le
-jruby:9.2.7.0-onbuild @ s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index d94257a..0d93201 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,45 +1,25 @@
jruby:9
-jruby:9-alpine
jruby:9-jdk
-jruby:9-jdk-alpine
jruby:9-onbuild
jruby:9.1
-jruby:9.1-alpine
jruby:9.1-jdk
-jruby:9.1-jdk-alpine
jruby:9.1-jre
-jruby:9.1-jre-alpine
jruby:9.1.17
-jruby:9.1.17-alpine
jruby:9.1.17-jdk
-jruby:9.1.17-jdk-alpine
jruby:9.1.17-jre
-jruby:9.1.17-jre-alpine
jruby:9.1.17.0
-jruby:9.1.17.0-alpine
jruby:9.1.17.0-jdk
-jruby:9.1.17.0-jdk-alpine
jruby:9.1.17.0-jre
-jruby:9.1.17.0-jre-alpine
jruby:9.2
-jruby:9.2-alpine
jruby:9.2-jdk
-jruby:9.2-jdk-alpine
jruby:9.2-jre
-jruby:9.2-jre-alpine
jruby:9.2-onbuild
jruby:9.2.7
-jruby:9.2.7-alpine
jruby:9.2.7-jdk
-jruby:9.2.7-jdk-alpine
jruby:9.2.7-jre
-jruby:9.2.7-jre-alpine
jruby:9.2.7-onbuild
jruby:9.2.7.0
-jruby:9.2.7.0-alpine
jruby:9.2.7.0-jdk
-jruby:9.2.7.0-jdk-alpine
jruby:9.2.7.0-jre
-jruby:9.2.7.0-jre-alpine
jruby:9.2.7.0-onbuild
jruby:latest
diff --git a/jruby_9.1.17.0-jdk-alpine/Dockerfile b/jruby_9.1.17.0-jdk-alpine/Dockerfile
deleted file mode 100644
index b290553..0000000
diff --git a/jruby_9.1.17.0-jre-alpine/Dockerfile b/jruby_9.1.17.0-jre-alpine/Dockerfile
deleted file mode 100644
index 11d0cfe..0000000
diff --git a/jruby_9.2.7.0-jdk-alpine/Dockerfile b/jruby_9.2.7.0-jdk-alpine/Dockerfile
deleted file mode 100644
index 81116ee..0000000
diff --git a/jruby_9.2.7.0-jre-alpine/Dockerfile b/jruby_9.2.7.0-jre-alpine/Dockerfile
deleted file mode 100644
index ca9dc12..0000000 |
|
Nice, looks good! I'm going to cc @cpuguy83 on this merge just so he's aware (but I'm going to go ahead and merge since I don't think he'll mind) 👍 Build test of #6493; 186c6ef; $ bashbrew build jruby:latest
Using bashbrew/cache:8946a272bb7b9b93a7515814c3bdc54d59074ac1a3b716fcd0483918eb2794d3 (jruby:latest)
Tagging jruby:latest
Tagging jruby:9
Tagging jruby:9.2
Tagging jruby:9.2.7
Tagging jruby:9.2-jre
Tagging jruby:9.2.7-jre
Tagging jruby:9.2.7.0
Tagging jruby:9.2.7.0-jre
$ test/run.sh jruby:latest
testing jruby:latest
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9-jdk
Using bashbrew/cache:acffb430b3f2bddd81ed331c9fad79707e3634724133c5cd5cf962bb0c3e43d0 (jruby:9-jdk)
Tagging jruby:9-jdk
Tagging jruby:9.2-jdk
Tagging jruby:9.2.7-jdk
Tagging jruby:9.2.7.0-jdk
$ test/run.sh jruby:9-jdk
testing jruby:9-jdk
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9.1
Using bashbrew/cache:66a7cc4eba60da09224814aeb93144f598953ada191827a62f2da376c1fedf58 (jruby:9.1)
Tagging jruby:9.1
Tagging jruby:9.1.17
Tagging jruby:9.1.17.0
Tagging jruby:9.1-jre
Tagging jruby:9.1.17-jre
Tagging jruby:9.1.17.0-jre
$ test/run.sh jruby:9.1
testing jruby:9.1
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...skipping activesupport due to required Ruby version: >= 2.5.0 (vs 2.3.3)
passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9.1-jdk
Using bashbrew/cache:c36159a52af0652be726a42102722ed0d677020ccfc0bdfc2b27814869dab211 (jruby:9.1-jdk)
Tagging jruby:9.1-jdk
Tagging jruby:9.1.17-jdk
Tagging jruby:9.1.17.0-jdk
$ test/run.sh jruby:9.1-jdk
testing jruby:9.1-jdk
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...passed
'override-cmd' [4/9]...passed
'ruby-hello-world' [5/9]...passed
'ruby-standard-libs' [6/9]...passed
'ruby-gems' [7/9]...skipping activesupport due to required Ruby version: >= 2.5.0 (vs 2.3.3)
passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9-onbuild
Using bashbrew/cache:bc431a340330e544ca3c7b5de45b8adcd399bb5975582cbbdc9e4117057e3239 (jruby:9-onbuild)
Tagging jruby:9-onbuild
Tagging jruby:9.2-onbuild
Tagging jruby:9.2.7-onbuild
Tagging jruby:9.2.7.0-onbuild
$ test/run.sh jruby:9-onbuild
testing jruby:9-onbuild
'override-cmd' [1/1]...passed
|
|
Thanks! |
|
Thanks @david-rodriguez |
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.
I read a bit through the links posted at #6468, and tried to catch up with the latest changes.