Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jruby to 9.2.8.0 #6468

Merged
merged 1 commit into from
Aug 20, 2019
Merged

Conversation

DanielASAndrews
Copy link
Contributor

  • Bump repo reference to latest.
  • s/9.2.7/9.2.8/

@tianon
Copy link
Member

tianon commented Aug 16, 2019

Thanks for the PR! Unfortunately, the jruby image has some unresolved issues right now (cc @cpuguy83): 😞

Invalid 'FROM' + 'Architectures' combinations detected:

  • jruby:9.1 (FROM openjdk:8-jre) [arm32v5, arm64v8, i386, ppc64le, s390x]
  • jruby:9.1-alpine (FROM openjdk:8-jre-alpine) -- completely unsupported base!
  • jruby:9.1-jdk (FROM openjdk:8-jdk) [arm32v5, arm64v8, i386, ppc64le, s390x]
  • jruby:9.1-jdk-alpine (FROM openjdk:8-jdk-alpine) -- completely unsupported base!
  • jruby:9-alpine (FROM openjdk:8-jre-alpine) -- completely unsupported base!
  • jruby:9-jdk (FROM openjdk:8-jdk) [arm32v5, arm64v8, i386, ppc64le, s390x]
  • jruby:9-jdk-alpine (FROM openjdk:8-jdk-alpine) -- completely unsupported base!
  • jruby:latest (FROM openjdk:8-jre) [arm32v5, arm64v8, i386, ppc64le, s390x]

Read https://github.com/docker-library/official-images#multiple-architectures for more details.

(See docker-library/openjdk#322 for the PR which introduced these changes and some discussion around them.)

@deivid-rodriguez
Copy link
Contributor

@DanielASAndrews It should be ok now after a rebase 👍

@cpuguy83
Copy link
Contributor

Thanks!

* Bump repo reference to latest.
* s/9.2.7/9.2.8/
@DanielASAndrews
Copy link
Contributor Author

Good to 🚀

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 93cfc8f..418fda4 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,5 +1,5 @@
 jruby:9.1.17.0-jdk @ amd64
 jruby:9.1.17.0-jre @ amd64
-jruby:9.2.7.0-jdk @ amd64
-jruby:9.2.7.0-jre @ amd64
 jruby:9.2.7.0-onbuild @ amd64
+jruby:9.2.8.0-jdk @ amd64
+jruby:9.2.8.0-jre @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 0d93201..024cbd8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,12 +14,12 @@ jruby:9.2
 jruby:9.2-jdk
 jruby:9.2-jre
 jruby:9.2-onbuild
-jruby:9.2.7
-jruby:9.2.7-jdk
-jruby:9.2.7-jre
 jruby:9.2.7-onbuild
-jruby:9.2.7.0
-jruby:9.2.7.0-jdk
-jruby:9.2.7.0-jre
 jruby:9.2.7.0-onbuild
+jruby:9.2.8
+jruby:9.2.8-jdk
+jruby:9.2.8-jre
+jruby:9.2.8.0
+jruby:9.2.8.0-jdk
+jruby:9.2.8.0-jre
 jruby:latest
diff --git a/jruby_9.2.7.0-jdk/Dockerfile b/jruby_9.2.8.0-jdk/Dockerfile
similarity index 91%
rename from jruby_9.2.7.0-jdk/Dockerfile
rename to jruby_9.2.8.0-jdk/Dockerfile
index 491e080..8fc1dfc 100644
--- a/jruby_9.2.7.0-jdk/Dockerfile
+++ b/jruby_9.2.8.0-jdk/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.7.0
-ENV JRUBY_SHA256 da7c1a5ce90015c0bafd4bca0352294e08fe1c9ec049ac51e82fe57ed50e1348
+ENV JRUBY_VERSION 9.2.8.0
+ENV JRUBY_SHA256 b7c58688093f54acd89d732a8bf40e3ae0ac4c92488d6f5b424c33e4fb09c7bb
 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.7.0-jre/Dockerfile b/jruby_9.2.8.0-jre/Dockerfile
similarity index 91%
rename from jruby_9.2.7.0-jre/Dockerfile
rename to jruby_9.2.8.0-jre/Dockerfile
index b197f6f..8fd7df9 100644
--- a/jruby_9.2.7.0-jre/Dockerfile
+++ b/jruby_9.2.8.0-jre/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.7.0
-ENV JRUBY_SHA256 da7c1a5ce90015c0bafd4bca0352294e08fe1c9ec049ac51e82fe57ed50e1348
+ENV JRUBY_VERSION 9.2.8.0
+ENV JRUBY_SHA256 b7c58688093f54acd89d732a8bf40e3ae0ac4c92488d6f5b424c33e4fb09c7bb
 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 - \

@yosifkit
Copy link
Member

Build test of #6468; 1332093; amd64 (jruby):

$ bashbrew build jruby:latest
Using bashbrew/cache:b036ae936aeb7c9d7f0cdd758032e4ae5800ce292b7efe689966071efb86f55f (jruby:latest)
Tagging jruby:latest
Tagging jruby:9
Tagging jruby:9.2
Tagging jruby:9.2.8
Tagging jruby:9.2-jre
Tagging jruby:9.2.8-jre
Tagging jruby:9.2.8.0
Tagging jruby:9.2.8.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:b1d67f0fe51545c13a4cded8c35e8aa0c86b542fb6b0f8baf84c5374caa0cc05 (jruby:9-jdk)
Tagging jruby:9-jdk
Tagging jruby:9.2-jdk
Tagging jruby:9.2.8-jdk
Tagging jruby:9.2.8.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:b136c52738c14f6c6b5ce469db3395e7cee97db1b73eff5df333caedee4ced4c (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

@yosifkit yosifkit merged commit 6311186 into docker-library:master Aug 20, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants