From 044aee807e44475c2085e43baab9b91055597461 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 6 Mar 2017 14:02:26 -0500 Subject: [PATCH] Bump version to 9.1.8.0 and 1.7.26 Also adds version updater script. Signed-off-by: Brian Goff --- 1.7/VERSION | 1 + 1.7/alpine-jdk/Dockerfile | 4 ++-- 1.7/alpine-jre/Dockerfile | 4 ++-- 1.7/jdk/Dockerfile | 4 ++-- 1.7/jre/Dockerfile | 4 ++-- 1.7/update.sh | 19 +++++++++++++++++++ 9000/VERSION | 1 + 9000/alpine-jdk/Dockerfile | 4 ++-- 9000/alpine-jre/Dockerfile | 4 ++-- 9000/jdk/Dockerfile | 4 ++-- 9000/jre/Dockerfile | 4 ++-- 9000/update.sh | 19 +++++++++++++++++++ update.sh | 12 ++++++++++++ 13 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 1.7/VERSION create mode 100755 1.7/update.sh create mode 100644 9000/VERSION create mode 100755 9000/update.sh create mode 100755 update.sh diff --git a/1.7/VERSION b/1.7/VERSION new file mode 100644 index 0000000..130990e --- /dev/null +++ b/1.7/VERSION @@ -0,0 +1 @@ +1.7.26 diff --git a/1.7/alpine-jdk/Dockerfile b/1.7/alpine-jdk/Dockerfile index cf6d068..6730044 100644 --- a/1.7/alpine-jdk/Dockerfile +++ b/1.7/alpine-jdk/Dockerfile @@ -4,8 +4,8 @@ RUN apk add --no-cache \ bash \ libc6-compat -ENV JRUBY_VERSION 1.7.25 -ENV JRUBY_SHA1 cd15aef419f97cff274491e53fcfb8b88ec36785 +ENV JRUBY_VERSION 1.7.26 +ENV JRUBY_SHA1 cca25a1ffb8b75a8d4a4d4667e7f6b20341c2b74 RUN apk add --no-cache --virtual .build-deps \ curl \ diff --git a/1.7/alpine-jre/Dockerfile b/1.7/alpine-jre/Dockerfile index 6a482ad..33956e5 100644 --- a/1.7/alpine-jre/Dockerfile +++ b/1.7/alpine-jre/Dockerfile @@ -4,8 +4,8 @@ RUN apk add --no-cache \ bash \ libc6-compat -ENV JRUBY_VERSION 1.7.25 -ENV JRUBY_SHA1 cd15aef419f97cff274491e53fcfb8b88ec36785 +ENV JRUBY_VERSION 1.7.26 +ENV JRUBY_SHA1 cca25a1ffb8b75a8d4a4d4667e7f6b20341c2b74 RUN apk add --no-cache --virtual .build-deps \ curl \ diff --git a/1.7/jdk/Dockerfile b/1.7/jdk/Dockerfile index df3b549..2549c02 100644 --- a/1.7/jdk/Dockerfile +++ b/1.7/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 1.7.25 -ENV JRUBY_SHA1 cd15aef419f97cff274491e53fcfb8b88ec36785 +ENV JRUBY_VERSION 1.7.26 +ENV JRUBY_SHA1 cca25a1ffb8b75a8d4a4d4667e7f6b20341c2b74 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_SHA1 /tmp/jruby.tar.gz" | sha1sum -c - \ diff --git a/1.7/jre/Dockerfile b/1.7/jre/Dockerfile index 6f9bdd8..e4dbbb1 100644 --- a/1.7/jre/Dockerfile +++ b/1.7/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 1.7.25 -ENV JRUBY_SHA1 cd15aef419f97cff274491e53fcfb8b88ec36785 +ENV JRUBY_VERSION 1.7.26 +ENV JRUBY_SHA1 cca25a1ffb8b75a8d4a4d4667e7f6b20341c2b74 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_SHA1 /tmp/jruby.tar.gz" | sha1sum -c - \ diff --git a/1.7/update.sh b/1.7/update.sh new file mode 100755 index 0000000..143b4c1 --- /dev/null +++ b/1.7/update.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +( + set -e + + JRUBY_VERSION=$(< VERSION) + SHA="$(curl -SLfs https://s3.amazonaws.com/jruby.org/downloads/${JRUBY_VERSION}/jruby-bin-${JRUBY_VERSION}.tar.gz.sha1)" + SHA=$(printf '%s' ${SHA}) + + for i in $(ls); do + if [ -d "$i" ]; then + echo setting version on "$i/Dockerfile" + sed -i "s/ENV\ JRUBY_VERSION.*/ENV JRUBY_VERSION ${JRUBY_VERSION}/" "$i/Dockerfile" + sed -i "s/ENV\ JRUBY_SHA1.*/ENV JRUBY_SHA1 ${SHA}/" "$i/Dockerfile" + fi + done + + echo versions updated to $JRUBY_VERSION @ $SHA +) diff --git a/9000/VERSION b/9000/VERSION new file mode 100644 index 0000000..f5a50fc --- /dev/null +++ b/9000/VERSION @@ -0,0 +1 @@ +9.1.8.0 diff --git a/9000/alpine-jdk/Dockerfile b/9000/alpine-jdk/Dockerfile index e9a1528..0a71ef9 100644 --- a/9000/alpine-jdk/Dockerfile +++ b/9000/alpine-jdk/Dockerfile @@ -4,8 +4,8 @@ RUN apk add --no-cache \ bash \ libc6-compat -ENV JRUBY_VERSION 9.1.7.0 -ENV JRUBY_SHA256 95ac7d2316fb7698039267265716dd2159fa5b49f0e0dc6e469c80ad59072926 +ENV JRUBY_VERSION 9.1.8.0 +ENV JRUBY_SHA256 20ac501c99a7cb3cf53ded64ac1b8bb6e0b0f6ba34a41b8bacc9715cd4bb2601 RUN apk add --no-cache --virtual .build-deps \ curl \ diff --git a/9000/alpine-jre/Dockerfile b/9000/alpine-jre/Dockerfile index 440c645..530e1db 100644 --- a/9000/alpine-jre/Dockerfile +++ b/9000/alpine-jre/Dockerfile @@ -4,8 +4,8 @@ RUN apk add --no-cache \ bash \ libc6-compat -ENV JRUBY_VERSION 9.1.7.0 -ENV JRUBY_SHA256 95ac7d2316fb7698039267265716dd2159fa5b49f0e0dc6e469c80ad59072926 +ENV JRUBY_VERSION 9.1.8.0 +ENV JRUBY_SHA256 20ac501c99a7cb3cf53ded64ac1b8bb6e0b0f6ba34a41b8bacc9715cd4bb2601 RUN apk add --no-cache --virtual .build-deps \ curl \ diff --git a/9000/jdk/Dockerfile b/9000/jdk/Dockerfile index 7061b0c..6c5c052 100644 --- a/9000/jdk/Dockerfile +++ b/9000/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.7.0 -ENV JRUBY_SHA256 95ac7d2316fb7698039267265716dd2159fa5b49f0e0dc6e469c80ad59072926 +ENV JRUBY_VERSION 9.1.8.0 +ENV JRUBY_SHA256 20ac501c99a7cb3cf53ded64ac1b8bb6e0b0f6ba34a41b8bacc9715cd4bb2601 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/9000/jre/Dockerfile b/9000/jre/Dockerfile index b30cfd4..1c721be 100644 --- a/9000/jre/Dockerfile +++ b/9000/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.7.0 -ENV JRUBY_SHA256 95ac7d2316fb7698039267265716dd2159fa5b49f0e0dc6e469c80ad59072926 +ENV JRUBY_VERSION 9.1.8.0 +ENV JRUBY_SHA256 20ac501c99a7cb3cf53ded64ac1b8bb6e0b0f6ba34a41b8bacc9715cd4bb2601 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/9000/update.sh b/9000/update.sh new file mode 100755 index 0000000..8ac058b --- /dev/null +++ b/9000/update.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +( + set -e + + JRUBY_VERSION=$(< VERSION) + SHA="$(curl -SLfs https://s3.amazonaws.com/jruby.org/downloads/${JRUBY_VERSION}/jruby-bin-${JRUBY_VERSION}.tar.gz.sha256)" + SHA=$(printf '%s' ${SHA}) + + for i in $(ls); do + if [ -d "$i" ]; then + echo setting version on "$i/Dockerfile" + sed -i "s/ENV\ JRUBY_VERSION.*/ENV JRUBY_VERSION ${JRUBY_VERSION}/" "$i/Dockerfile" + sed -i "s/ENV\ JRUBY_SHA256.*/ENV JRUBY_SHA256 ${SHA}/" "$i/Dockerfile" + fi + done + + echo versions updated to $JRUBY_VERSION @ $SHA +) diff --git a/update.sh b/update.sh new file mode 100755 index 0000000..188b8c5 --- /dev/null +++ b/update.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +for i in $(ls); do + if [ -d "$i" ]; then + echo updating versions for "$i" + ( + cd $i + ./update.sh + echo + ) + fi +done