Make sure that jruby 9.1 is actively built #4971
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
This is still used and should get security updates. Signed-off-by: Brian Goff <[email protected]>
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index f55520b..198584b 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,3 +1,21 @@
+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 @ arm32v5
+jruby:9.1.17.0-jdk-alpine @ arm64v8
+jruby:9.1.17.0-jdk-alpine @ i386
+jruby:9.1.17.0-jdk-alpine @ ppc64le
+jruby:9.1.17.0-jdk-alpine @ s390x
+jruby:9.1.17.0-jre-alpine @ amd64
+jruby:9.1.17.0-jre-alpine @ arm32v5
+jruby:9.1.17.0-jre-alpine @ arm64v8
+jruby:9.1.17.0-jre-alpine @ i386
+jruby:9.1.17.0-jre-alpine @ ppc64le
+jruby:9.1.17.0-jre-alpine @ s390x
jruby:9.2.0.0-jdk @ amd64
jruby:9.2.0.0-jdk @ arm32v5
jruby:9.2.0.0-jdk @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 8c78771..28b9934 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,6 +3,24 @@ 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
diff --git a/jruby_9.2.0.0-jdk-alpine/Dockerfile b/jruby_9.1.17.0-jdk-alpine/Dockerfile
similarity index 89%
copy from jruby_9.2.0.0-jdk-alpine/Dockerfile
copy to jruby_9.1.17.0-jdk-alpine/Dockerfile
index c3ae69c..b290553 100644
--- a/jruby_9.2.0.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.2.0.0
-ENV JRUBY_SHA256 42718dea5fc90b7696cb3fccf8e8d546729173963ad0bc477d66545677d00684
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
RUN apk add --no-cache --virtual .build-deps \
curl \
@@ -29,7 +29,7 @@ RUN mkdir -p /opt/jruby/etc \
} >> /opt/jruby/etc/gemrc
# install bundler, gem requires bash to work
-RUN gem install bundler rake net-telnet xmlrpc
+RUN gem install bundler
# install things globally, for great justice
# and don't create ".bundle" in all our apps
diff --git a/jruby_9.2.0.0-jdk/Dockerfile b/jruby_9.1.17.0-jdk/Dockerfile
similarity index 87%
copy from jruby_9.2.0.0-jdk/Dockerfile
copy to jruby_9.1.17.0-jdk/Dockerfile
index b69627f..fa092c1 100644
--- a/jruby_9.2.0.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.2.0.0
-ENV JRUBY_SHA256 42718dea5fc90b7696cb3fccf8e8d546729173963ad0bc477d66545677d00684
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
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 - \
@@ -19,7 +19,7 @@ RUN mkdir -p /opt/jruby/etc \
echo 'update: --no-document'; \
} >> /opt/jruby/etc/gemrc
-RUN gem install bundler rake net-telnet xmlrpc
+RUN gem install bundler
# install things globally, for great justice
# and don't create ".bundle" in all our apps
diff --git a/jruby_9.2.0.0-jre/Dockerfile b/jruby_9.1.17.0-jre-alpine/Dockerfile
similarity index 87%
copy from jruby_9.2.0.0-jre/Dockerfile
copy to jruby_9.1.17.0-jre-alpine/Dockerfile
index 38d6069..5a0bd3d 100644
--- a/jruby_9.2.0.0-jre/Dockerfile
+++ b/jruby_9.1.17.0-jre-alpine/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.0.0
-ENV JRUBY_SHA256 42718dea5fc90b7696cb3fccf8e8d546729173963ad0bc477d66545677d00684
+ENV JRUBY_VERSION 9.1.17.0
+ENV JRUBY_SHA256 6a22f7bf8fef1a52530a9c9781a9d374ad07bbbef0d3d8e2af0ff5cbead0dfd5
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 - \
@@ -19,7 +19,7 @@ RUN mkdir -p /opt/jruby/etc \
echo 'update: --no-document'; \
} >> /opt/jruby/etc/gemrc
-RUN gem install bundler rake net-telnet xmlrpc
+RUN gem install bundler
# install things globally, for great justice
# and don't create ".bundle" in all our apps |
|
Build test of #4971; 7c5f694; $ bashbrew build jruby:latest
Using bashbrew/cache:5594856c4e7ecaf96037afe830ebb5e73f5f0d55fcae10f6f810d296bded4929 (jruby:latest)
Tagging jruby:latest
Tagging jruby:9
Tagging jruby:9.2
Tagging jruby:9.2.0
Tagging jruby:9.2-jre
Tagging jruby:9.2.0-jre
Tagging jruby:9.2.0.0
Tagging jruby:9.2.0.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
Using bashbrew/cache:9cceac5e5fb5c06f0c84b04c7d87af445f79a865487654832c79b0420e524d0c (jruby:9-alpine)
Tagging jruby:9-alpine
Tagging jruby:9.2-alpine
Tagging jruby:9.2.0-alpine
Tagging jruby:9.2-jre-alpine
Tagging jruby:9.2.0-jre-alpine
Tagging jruby:9.2.0.0-alpine
Tagging jruby:9.2.0.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
Using bashbrew/cache:34aa07e64bb8e6bc087723d816c7d8fc2ab46e4c41988be45f6a655033888cf3 (jruby:9-jdk)
Tagging jruby:9-jdk
Tagging jruby:9.2-jdk
Tagging jruby:9.2.0-jdk
Tagging jruby:9.2.0.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
Using bashbrew/cache:78fadbba42f6203f2d1b754790076c1be9476ed04456c845f608bcf03eb8a22a (jruby:9-jdk-alpine)
Tagging jruby:9-jdk-alpine
Tagging jruby:9.2-jdk-alpine
Tagging jruby:9.2.0-jdk-alpine
Tagging jruby:9.2.0.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.1
Building bashbrew/cache:40ef1fa9e630b7e37bc1839727db4cc8e84f5c1b82cec1fb5ce8052d79b59262 (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
Tagging jruby:9.1-alpine
Tagging jruby:9.1.17-alpine
Tagging jruby:9.1.17.0-alpine
Tagging jruby:9.1-jre-alpine
Tagging jruby:9.1.17-jre-alpine
Tagging jruby:9.1.17.0-jre-alpine
$ 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]...passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9.1-jdk-alpine
Building bashbrew/cache:e2c97c71bb749359e153ee256e0b10750fab2aa08f879610bbaea38b7a1bb415 (jruby:9.1-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.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.1-jdk
Building bashbrew/cache:73aba6b23077bded09499164692264e6dac151e0eb80a564e59e3814fa1294e6 (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]...passed
'ruby-bundler' [8/9]...passed
'ruby-nonroot' [9/9]...passed
$ bashbrew build jruby:9-onbuild
Building bashbrew/cache:3becddd32432beeab7bc5cc14b1558ae68ffc1a3321e7cb7bc73620fdb9d49b7 (jruby:9-onbuild)
Tagging jruby:9-onbuild
Tagging jruby:9.2-onbuild
Tagging jruby:9.2.0-onbuild
Tagging jruby:9.2.0.0-onbuild
$ test/run.sh jruby:9-onbuild
testing jruby:9-onbuild
'override-cmd' [1/1]...passed
|
|
LGTM, but you may want to eventually drop (#2076) or update the onbuild: https://github.com/cpuguy83/docker-jruby/blob/fadb44e816ee8d361d0ff45261efe1482a4d9441/9000/onbuild/Dockerfile#L1 |
|
Wow, thanks so much, that was real fast! 💯 |
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.
This is still used and should get security updates.
Closes jruby/docker-jruby#35