diff --git a/2.2/Dockerfile b/2.2/Dockerfile index b677b877c..a2c549c6b 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:jessie RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/* ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.0-preview2 +ENV RUBY_VERSION 2.2.0-rc1 # some of ruby's build scripts are written in ruby # we purge this later to make sure our final image uses what we just built diff --git a/2.2/onbuild/Dockerfile b/2.2/onbuild/Dockerfile index f945fab3b..84fed0bf7 100644 --- a/2.2/onbuild/Dockerfile +++ b/2.2/onbuild/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.2.0-preview2 +FROM ruby:2.2.0-rc1 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 diff --git a/2.2/wheezy/Dockerfile b/2.2/wheezy/Dockerfile index d41c9ffcc..8019a6ff0 100644 --- a/2.2/wheezy/Dockerfile +++ b/2.2/wheezy/Dockerfile @@ -3,7 +3,7 @@ FROM buildpack-deps:wheezy RUN apt-get update && apt-get install -y curl procps && rm -rf /var/lib/apt/lists/* ENV RUBY_MAJOR 2.2 -ENV RUBY_VERSION 2.2.0-preview2 +ENV RUBY_VERSION 2.2.0-rc1 # some of ruby's build scripts are written in ruby # we purge this later to make sure our final image uses what we just built diff --git a/update.sh b/update.sh index 36fe886f3..3c4d4d60d 100755 --- a/update.sh +++ b/update.sh @@ -17,8 +17,8 @@ for version in "${versions[@]}"; do | sort -V | tail -1)" ( set -x - sed -ri 's/^(ENV RUBY_MAJOR) .*/\1 '"$version"'/' "$version/Dockerfile" - sed -ri 's/^(ENV RUBY_VERSION) .*/\1 '"$fullVersion"'/' "$version/Dockerfile" + sed -ri 's/^(ENV RUBY_MAJOR) .*/\1 '"$version"'/' "$version/"{,wheezy/}Dockerfile + sed -ri 's/^(ENV RUBY_VERSION) .*/\1 '"$fullVersion"'/' "$version/"{,wheezy/}Dockerfile sed -ri 's/^(FROM ruby):.*/\1:'"$fullVersion"'/' "$version/"*"/Dockerfile" ) done