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.1.17.0 #4278

Merged
merged 1 commit into from
Apr 23, 2018
Merged

Bump jruby to 9.1.17.0 #4278

merged 1 commit into from
Apr 23, 2018

Conversation

cpuguy83
Copy link
Contributor

No description provided.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@tianon
Copy link
Member

tianon commented Apr 23, 2018

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index cccc872..b1a271d 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,26 +1,26 @@
-jruby:9.1.16.0-jdk @ amd64
-jruby:9.1.16.0-jdk @ arm32v5
-jruby:9.1.16.0-jdk @ arm64v8
-jruby:9.1.16.0-jdk @ i386
-jruby:9.1.16.0-jdk @ ppc64le
-jruby:9.1.16.0-jdk @ s390x
-jruby:9.1.16.0-jdk-alpine @ amd64
-jruby:9.1.16.0-jdk-alpine @ arm64v8
-jruby:9.1.16.0-jdk-alpine @ ppc64le
-jruby:9.1.16.0-jdk-alpine @ s390x
-jruby:9.1.16.0-jre @ amd64
-jruby:9.1.16.0-jre @ arm32v5
-jruby:9.1.16.0-jre @ arm64v8
-jruby:9.1.16.0-jre @ i386
-jruby:9.1.16.0-jre @ ppc64le
-jruby:9.1.16.0-jre @ s390x
-jruby:9.1.16.0-jre-alpine @ amd64
-jruby:9.1.16.0-jre-alpine @ arm64v8
-jruby:9.1.16.0-jre-alpine @ ppc64le
-jruby:9.1.16.0-jre-alpine @ s390x
-jruby:9.1.16.0-onbuild @ amd64
-jruby:9.1.16.0-onbuild @ arm32v5
-jruby:9.1.16.0-onbuild @ arm64v8
-jruby:9.1.16.0-onbuild @ i386
-jruby:9.1.16.0-onbuild @ ppc64le
-jruby:9.1.16.0-onbuild @ s390x
+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.1.17.0-onbuild @ amd64
+jruby:9.1.17.0-onbuild @ arm32v5
+jruby:9.1.17.0-onbuild @ arm64v8
+jruby:9.1.17.0-onbuild @ i386
+jruby:9.1.17.0-onbuild @ ppc64le
+jruby:9.1.17.0-onbuild @ s390x
diff --git a/_bashbrew-list b/_bashbrew-list
index 6b6c3b4..d67fc04 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -10,18 +10,18 @@ jruby:9.1-jdk-alpine
 jruby:9.1-jre
 jruby:9.1-jre-alpine
 jruby:9.1-onbuild
-jruby:9.1.16
-jruby:9.1.16-alpine
-jruby:9.1.16-jdk
-jruby:9.1.16-jdk-alpine
-jruby:9.1.16-jre
-jruby:9.1.16-jre-alpine
-jruby:9.1.16-onbuild
-jruby:9.1.16.0
-jruby:9.1.16.0-alpine
-jruby:9.1.16.0-jdk
-jruby:9.1.16.0-jdk-alpine
-jruby:9.1.16.0-jre
-jruby:9.1.16.0-jre-alpine
-jruby:9.1.16.0-onbuild
+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-onbuild
+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.1.17.0-onbuild
 jruby:latest
diff --git a/jruby_9.1.16.0-jdk-alpine/Dockerfile b/jruby_9.1.17.0-jdk-alpine/Dockerfile
similarity index 92%
rename from jruby_9.1.16.0-jdk-alpine/Dockerfile
rename to jruby_9.1.17.0-jdk-alpine/Dockerfile
index 7550d69..cacc455 100644
--- a/jruby_9.1.16.0-jdk-alpine/Dockerfile
+++ b/jruby_9.1.17.0-jdk-alpine/Dockerfile
@@ -4,8 +4,8 @@ RUN apk add --no-cache \
       bash \
       libc6-compat
 
-ENV JRUBY_VERSION 9.1.16.0
-ENV JRUBY_SHA256 d92c2b359e32a0afffef6982dc4730e4bdfcabd9c198e9c6075292c71ad9485a
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
 
 RUN apk add --no-cache --virtual .build-deps \
       curl \
diff --git a/jruby_9.1.16.0-jdk/Dockerfile b/jruby_9.1.17.0-jdk/Dockerfile
similarity index 91%
rename from jruby_9.1.16.0-jdk/Dockerfile
rename to jruby_9.1.17.0-jdk/Dockerfile
index a096af3..ee9d934 100644
--- a/jruby_9.1.16.0-jdk/Dockerfile
+++ b/jruby_9.1.17.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.1.16.0
-ENV JRUBY_SHA256 d92c2b359e32a0afffef6982dc4730e4bdfcabd9c198e9c6075292c71ad9485a
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
 RUN mkdir /opt/jruby \
   && curl -fSL https://s3.amazonaws.com/jruby.org/downloads/${JRUBY_VERSION}/jruby-bin-${JRUBY_VERSION}.tar.gz -o /tmp/jruby.tar.gz \
   && echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.1.16.0-jre-alpine/Dockerfile b/jruby_9.1.17.0-jre-alpine/Dockerfile
similarity index 92%
rename from jruby_9.1.16.0-jre-alpine/Dockerfile
rename to jruby_9.1.17.0-jre-alpine/Dockerfile
index 4ea0c3e..343202c 100644
--- a/jruby_9.1.16.0-jre-alpine/Dockerfile
+++ b/jruby_9.1.17.0-jre-alpine/Dockerfile
@@ -4,8 +4,8 @@ RUN apk add --no-cache \
       bash \
       libc6-compat
 
-ENV JRUBY_VERSION 9.1.16.0
-ENV JRUBY_SHA256 d92c2b359e32a0afffef6982dc4730e4bdfcabd9c198e9c6075292c71ad9485a
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
 
 RUN apk add --no-cache --virtual .build-deps \
       curl \
diff --git a/jruby_9.1.16.0-jre/Dockerfile b/jruby_9.1.17.0-jre/Dockerfile
similarity index 91%
rename from jruby_9.1.16.0-jre/Dockerfile
rename to jruby_9.1.17.0-jre/Dockerfile
index 266aa9e..d8b2302 100644
--- a/jruby_9.1.16.0-jre/Dockerfile
+++ b/jruby_9.1.17.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.1.16.0
-ENV JRUBY_SHA256 d92c2b359e32a0afffef6982dc4730e4bdfcabd9c198e9c6075292c71ad9485a
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
 RUN mkdir /opt/jruby \
   && curl -fSL https://s3.amazonaws.com/jruby.org/downloads/${JRUBY_VERSION}/jruby-bin-${JRUBY_VERSION}.tar.gz -o /tmp/jruby.tar.gz \
   && echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
diff --git a/jruby_9.1.16.0-onbuild/Dockerfile b/jruby_9.1.17.0-onbuild/Dockerfile
similarity index 100%
rename from jruby_9.1.16.0-onbuild/Dockerfile
rename to jruby_9.1.17.0-onbuild/Dockerfile

@tianon
Copy link
Member

tianon commented Apr 23, 2018

LGTM

Build test of #4278; 92026dc; amd64 (jruby):

$ bashbrew build jruby:latest
Building bashbrew/cache:c2cb8d067a58f4af5ff6294d3910c3de9e84a58cfe8356b0717ce7ea3de44f8d (jruby:latest)
Tagging jruby:latest
Tagging jruby:9
Tagging jruby:9.1
Tagging jruby:9.1.17
Tagging jruby:9.1-jre
Tagging jruby:9.1.17-jre
Tagging jruby:9.1.17.0
Tagging jruby:9.1.17.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-alpine
Building bashbrew/cache:131ae45c9dcdc0f3454e2b72003e30b5e6445d4a4298f4b7a9d4cfb0963ffa70 (jruby:9-alpine)
Tagging jruby:9-alpine
Tagging jruby:9.1-alpine
Tagging jruby:9.1.17-alpine
Tagging jruby:9.1-jre-alpine
Tagging jruby:9.1.17-jre-alpine
Tagging jruby:9.1.17.0-alpine
Tagging jruby:9.1.17.0-jre-alpine

$ test/run.sh jruby:9-alpine
testing jruby:9-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'ruby-hello-world' [5/7]...passed
	'ruby-standard-libs' [6/7]...passed
	'ruby-nonroot' [7/7]...passed


$ bashbrew build jruby:9-jdk
Building bashbrew/cache:8f591393a31aabfca4259f0a8f5793892d22530b60f8f4e1266e6093a020a5e3 (jruby:9-jdk)
Tagging jruby:9-jdk
Tagging jruby:9.1-jdk
Tagging jruby:9.1.17-jdk
Tagging jruby:9.1.17.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-jdk-alpine
Building bashbrew/cache:5586f7f65d49849b73955793094657aa97c9856341a409fc88eec15fe7f01a15 (jruby:9-jdk-alpine)
Tagging jruby:9-jdk-alpine
Tagging jruby:9.1-jdk-alpine
Tagging jruby:9.1.17-jdk-alpine
Tagging jruby:9.1.17.0-jdk-alpine

$ test/run.sh jruby:9-jdk-alpine
testing jruby:9-jdk-alpine
	'utc' [1/7]...passed
	'cve-2014--shellshock' [2/7]...passed
	'no-hard-coded-passwords' [3/7]...passed
	'override-cmd' [4/7]...passed
	'ruby-hello-world' [5/7]...passed
	'ruby-standard-libs' [6/7]...passed
	'ruby-nonroot' [7/7]...passed


$ bashbrew build jruby:9-onbuild
Building bashbrew/cache:b96c6407ddb606eadb22a1e84d8b9bf970e767108dba40feef8bc5571a3f3320 (jruby:9-onbuild)
Tagging jruby:9-onbuild
Tagging jruby:9.1-onbuild
Tagging jruby:9.1.17-onbuild
Tagging jruby:9.1.17.0-onbuild

$ test/run.sh jruby:9-onbuild
testing jruby:9-onbuild
	'override-cmd' [1/1]...passed

@tianon tianon merged commit 63c528e into docker-library:master Apr 23, 2018
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.

3 participants