From e5d5ed23036c66c5797c39e0e156de5d006dbfc0 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Tue, 26 Dec 2017 11:42:18 +0900 Subject: [PATCH] Remove rc label from 2.5.0 --- .travis.yml | 6 +++--- {2.5-rc => 2.5}/alpine3.7/Dockerfile | 6 +++--- {2.5-rc => 2.5}/stretch/Dockerfile | 6 +++--- {2.5-rc => 2.5}/stretch/slim/Dockerfile | 6 +++--- generate-stackbrew-library.sh | 3 +-- 5 files changed, 13 insertions(+), 14 deletions(-) rename {2.5-rc => 2.5}/alpine3.7/Dockerfile (95%) rename {2.5-rc => 2.5}/stretch/Dockerfile (93%) rename {2.5-rc => 2.5}/stretch/slim/Dockerfile (94%) diff --git a/.travis.yml b/.travis.yml index 89c736bb8..1c64eaf65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=2.5-rc VARIANT=stretch - - VERSION=2.5-rc VARIANT=stretch/slim - - VERSION=2.5-rc VARIANT=alpine3.7 + - VERSION=2.5 VARIANT=stretch + - VERSION=2.5 VARIANT=stretch/slim + - VERSION=2.5 VARIANT=alpine3.7 - VERSION=2.4 VARIANT=stretch - VERSION=2.4 VARIANT=stretch/slim - VERSION=2.4 VARIANT=jessie diff --git a/2.5-rc/alpine3.7/Dockerfile b/2.5/alpine3.7/Dockerfile similarity index 95% rename from 2.5-rc/alpine3.7/Dockerfile rename to 2.5/alpine3.7/Dockerfile index 1fbf826c5..2873a3b6b 100644 --- a/2.5-rc/alpine3.7/Dockerfile +++ b/2.5/alpine3.7/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.0 +ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.5-rc/stretch/Dockerfile b/2.5/stretch/Dockerfile similarity index 93% rename from 2.5-rc/stretch/Dockerfile rename to 2.5/stretch/Dockerfile index 718188d5a..d041b962a 100644 --- a/2.5-rc/stretch/Dockerfile +++ b/2.5/stretch/Dockerfile @@ -7,9 +7,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.0 +ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 diff --git a/2.5-rc/stretch/slim/Dockerfile b/2.5/stretch/slim/Dockerfile similarity index 94% rename from 2.5-rc/stretch/slim/Dockerfile rename to 2.5/stretch/slim/Dockerfile index 48aedc53f..e31092b6b 100644 --- a/2.5-rc/stretch/slim/Dockerfile +++ b/2.5/stretch/slim/Dockerfile @@ -19,9 +19,9 @@ RUN mkdir -p /usr/local/etc \ echo 'update: --no-document'; \ } >> /usr/local/etc/gemrc -ENV RUBY_MAJOR 2.5-rc -ENV RUBY_VERSION 2.5.0-rc1 -ENV RUBY_DOWNLOAD_SHA256 a479a1bce69b2cf656821f10104dcb8b426922b56d3d6cbdf48318842fae752c +ENV RUBY_MAJOR 2.5 +ENV RUBY_VERSION 2.5.0 +ENV RUBY_DOWNLOAD_SHA256 1da0afed833a0dab94075221a615c14487b05d0c407f991c8080d576d985b49b ENV RUBYGEMS_VERSION 2.7.4 ENV BUNDLER_VERSION 1.16.1 diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 7889f8c4b..72ddc3707 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,7 @@ set -Eeuo pipefail declare -A aliases=( - [2.4]='2 latest' - [2.5-rc]='rc' + [2.5]='2 latest' ) defaultDebianSuite='stretch'