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.12.0 #3092

Merged
merged 1 commit into from
Jun 19, 2017
Merged

Bump jruby to 9.1.12.0 #3092

merged 1 commit into from
Jun 19, 2017

Conversation

cpuguy83
Copy link
Contributor

No description provided.

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

tianon commented Jun 19, 2017

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index f099dde..0ba47de 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,8 +1,8 @@
 jruby:1.7.27-jdk @ amd64
 jruby:1.7.27-jre @ amd64
 jruby:1.7.27-onbuild @ amd64
-jruby:9.1.10.0-jdk @ amd64
-jruby:9.1.10.0-jdk-alpine @ amd64
-jruby:9.1.10.0-jre @ amd64
-jruby:9.1.10.0-jre-alpine @ amd64
-jruby:9.1.10.0-onbuild @ amd64
+jruby:9.1.12.0-jdk @ amd64
+jruby:9.1.12.0-jdk-alpine @ amd64
+jruby:9.1.12.0-jre @ amd64
+jruby:9.1.12.0-jre-alpine @ amd64
+jruby:9.1.12.0-onbuild @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index 5a005ad..3498cc6 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -16,18 +16,18 @@ jruby:9.1-jdk-alpine
 jruby:9.1-jre
 jruby:9.1-jre-alpine
 jruby:9.1-onbuild
-jruby:9.1.10
-jruby:9.1.10-alpine
-jruby:9.1.10-jdk
-jruby:9.1.10-jdk-alpine
-jruby:9.1.10-jre
-jruby:9.1.10-jre-alpine
-jruby:9.1.10-onbuild
-jruby:9.1.10.0
-jruby:9.1.10.0-alpine
-jruby:9.1.10.0-jdk
-jruby:9.1.10.0-jdk-alpine
-jruby:9.1.10.0-jre
-jruby:9.1.10.0-jre-alpine
-jruby:9.1.10.0-onbuild
+jruby:9.1.12
+jruby:9.1.12-alpine
+jruby:9.1.12-jdk
+jruby:9.1.12-jdk-alpine
+jruby:9.1.12-jre
+jruby:9.1.12-jre-alpine
+jruby:9.1.12-onbuild
+jruby:9.1.12.0
+jruby:9.1.12.0-alpine
+jruby:9.1.12.0-jdk
+jruby:9.1.12.0-jdk-alpine
+jruby:9.1.12.0-jre
+jruby:9.1.12.0-jre-alpine
+jruby:9.1.12.0-onbuild
 jruby:latest
diff --git a/jruby_9.1.10.0-jdk-alpine/Dockerfile b/jruby_9.1.12.0-jdk-alpine/Dockerfile
similarity index 92%
rename from jruby_9.1.10.0-jdk-alpine/Dockerfile
rename to jruby_9.1.12.0-jdk-alpine/Dockerfile
index 8ee5da0..699dce5 100644
--- a/jruby_9.1.10.0-jdk-alpine/Dockerfile
+++ b/jruby_9.1.12.0-jdk-alpine/Dockerfile
@@ -4,8 +4,8 @@ RUN apk add --no-cache \
       bash \
       libc6-compat
 
-ENV JRUBY_VERSION 9.1.10.0
-ENV JRUBY_SHA256 93ec6b55fa0d5b37e9f8131f76adc01efa82bebcef8df3e0de49e83dad3ee958
+ENV JRUBY_VERSION 9.1.12.0
+ENV JRUBY_SHA256 ddb23c95f4b3cc3fc1cc57b81cb4ceee776496ede402b9a6eb0622cf15e1a597
 
 RUN apk add --no-cache --virtual .build-deps \
       curl \
diff --git a/jruby_9.1.10.0-jdk/Dockerfile b/jruby_9.1.12.0-jdk/Dockerfile
similarity index 91%
rename from jruby_9.1.10.0-jdk/Dockerfile
rename to jruby_9.1.12.0-jdk/Dockerfile
index 440bc7d..fc09bc7 100644
--- a/jruby_9.1.10.0-jdk/Dockerfile
+++ b/jruby_9.1.12.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.10.0
-ENV JRUBY_SHA256 93ec6b55fa0d5b37e9f8131f76adc01efa82bebcef8df3e0de49e83dad3ee958
+ENV JRUBY_VERSION 9.1.12.0
+ENV JRUBY_SHA256 ddb23c95f4b3cc3fc1cc57b81cb4ceee776496ede402b9a6eb0622cf15e1a597
 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.10.0-jre-alpine/Dockerfile b/jruby_9.1.12.0-jre-alpine/Dockerfile
similarity index 92%
rename from jruby_9.1.10.0-jre-alpine/Dockerfile
rename to jruby_9.1.12.0-jre-alpine/Dockerfile
index 2cdc0aa..9baaa4c 100644
--- a/jruby_9.1.10.0-jre-alpine/Dockerfile
+++ b/jruby_9.1.12.0-jre-alpine/Dockerfile
@@ -4,8 +4,8 @@ RUN apk add --no-cache \
       bash \
       libc6-compat
 
-ENV JRUBY_VERSION 9.1.10.0
-ENV JRUBY_SHA256 93ec6b55fa0d5b37e9f8131f76adc01efa82bebcef8df3e0de49e83dad3ee958
+ENV JRUBY_VERSION 9.1.12.0
+ENV JRUBY_SHA256 ddb23c95f4b3cc3fc1cc57b81cb4ceee776496ede402b9a6eb0622cf15e1a597
 
 RUN apk add --no-cache --virtual .build-deps \
       curl \
diff --git a/jruby_9.1.10.0-jre/Dockerfile b/jruby_9.1.12.0-jre/Dockerfile
similarity index 91%
rename from jruby_9.1.10.0-jre/Dockerfile
rename to jruby_9.1.12.0-jre/Dockerfile
index 8e88d75..0719998 100644
--- a/jruby_9.1.10.0-jre/Dockerfile
+++ b/jruby_9.1.12.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.10.0
-ENV JRUBY_SHA256 93ec6b55fa0d5b37e9f8131f76adc01efa82bebcef8df3e0de49e83dad3ee958
+ENV JRUBY_VERSION 9.1.12.0
+ENV JRUBY_SHA256 ddb23c95f4b3cc3fc1cc57b81cb4ceee776496ede402b9a6eb0622cf15e1a597
 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.10.0-onbuild/Dockerfile b/jruby_9.1.12.0-onbuild/Dockerfile
similarity index 100%
rename from jruby_9.1.10.0-onbuild/Dockerfile
rename to jruby_9.1.12.0-onbuild/Dockerfile

@tianon
Copy link
Member

tianon commented Jun 19, 2017

LGTM

Build test of #3092; fb0c191 (jruby):

$ bashbrew build jruby:latest
Building bashbrew/cache:69c55dda6d2d48541e7a127c9aceb103f74f2efd1834acaa522cc980a742d424 (jruby:latest)
Tagging jruby:latest
Tagging jruby:9
Tagging jruby:9.1
Tagging jruby:9.1-jre
Tagging jruby:9.1.12
Tagging jruby:9.1.12-jre
Tagging jruby:9.1.12.0
Tagging jruby:9.1.12.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:5d198f4e693b37a54096a2236fc2dd17584ff604c303544305c4f0fa9615bd78 (jruby:9-alpine)
Tagging jruby:9-alpine
Tagging jruby:9.1-alpine
Tagging jruby:9.1-jre-alpine
Tagging jruby:9.1.12-alpine
Tagging jruby:9.1.12-jre-alpine
Tagging jruby:9.1.12.0-alpine
Tagging jruby:9.1.12.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.1-jdk
Building bashbrew/cache:5c610289bfc5b368d81aaf69b6b763dc7f4877b65e652ceb94032bade3c90239 (jruby:9.1-jdk)
Tagging jruby:9.1-jdk
Tagging jruby:9.1.12-jdk
Tagging jruby:9.1.12.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]...passed
	'ruby-bundler' [8/9]...passed
	'ruby-nonroot' [9/9]...passed


$ bashbrew build jruby:9.1-jdk-alpine
Building bashbrew/cache:ee099a6c218fc3910fee8048fa58115de334ece3f683acf0a96acf4d9e87b80f (jruby:9.1-jdk-alpine)
Tagging jruby:9.1-jdk-alpine
Tagging jruby:9.1.12-jdk-alpine
Tagging jruby:9.1.12.0-jdk-alpine

$ test/run.sh jruby:9.1-jdk-alpine
testing jruby:9.1-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:7fafdfd6e912291a47ba5abb6669343a0f702e88b4033fbc0eb4ccb8ec8e9151 (jruby:9-onbuild)
Tagging jruby:9-onbuild
Tagging jruby:9.1-onbuild
Tagging jruby:9.1.12-onbuild
Tagging jruby:9.1.12.0-onbuild

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


$ bashbrew build jruby:1.7
Building bashbrew/cache:43b828f6f9de46d9c1fd83a6323fcd87197419045d173a562b82e305605f0f2c (jruby:1.7)
Tagging jruby:1.7
Tagging jruby:1.7.27
Tagging jruby:1.7-jre
Tagging jruby:1.7.27-jre

$ test/run.sh jruby:1.7
testing jruby:1.7
	'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:1.7-jdk
Building bashbrew/cache:9f3ba4d55114ed64e04ef9d277e3891043ad2eb48bd4aa9432aa53cf61369cbc (jruby:1.7-jdk)
Tagging jruby:1.7-jdk
Tagging jruby:1.7.27-jdk

$ test/run.sh jruby:1.7-jdk
testing jruby:1.7-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:1.7-onbuild
Building bashbrew/cache:5c9c0005ce7261181eb7db92d167b830367f67be76ebc26e1a26a5a9c4fec2b7 (jruby:1.7-onbuild)
Tagging jruby:1.7-onbuild
Tagging jruby:1.7.27-onbuild

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

@tianon tianon merged commit 04f57f5 into docker-library:master Jun 19, 2017
@cpuguy83 cpuguy83 deleted the bump_jruby branch June 19, 2017 17:45
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