From 51c31933fbf3081cad82ca9696cd7ce925d729fb Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 14 May 2014 07:48:20 +1000 Subject: [PATCH] UPDATE to Ruby 2.1.2 --- image/base_21/Dockerfile | 8 ++++---- image/discourse_21/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/image/base_21/Dockerfile b/image/base_21/Dockerfile index b2b8a52..49fdf44 100644 --- a/image/base_21/Dockerfile +++ b/image/base_21/Dockerfile @@ -40,11 +40,11 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\ mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\ cd /src/ruby-build && ./install.sh &&\ cd / && rm -rf /src/ruby-build &&\ - echo install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#5fe00cda18ca5daeb43762b80c38e06e" --if needs_yaml > /src/2.1.1.discourse &&\ - echo install_package "openssl-1.0.1g" "https://www.openssl.org/source/openssl-1.0.1g.tar.gz#de62b43dfcd858e66a74bee1c834e959" mac_openssl --if has_broken_mac_openssl >> /src/2.1.1.discourse &&\ - echo install_package "ruby-2.1.1_discourse" "https://github.com/SamSaffron/ruby/archive/v2.1.1_discourse.tar.gz#08f9d27173ffb481c30ca3088b222b9c" ldflags_dirs standard verify_openssl >> /src/2.1.1.discourse &&\ + echo install_package "yaml-0.1.6" "http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz#5fe00cda18ca5daeb43762b80c38e06e" --if needs_yaml > /src/2.1.2.discourse &&\ + echo install_package "openssl-1.0.1g" "https://www.openssl.org/source/openssl-1.0.1g.tar.gz#de62b43dfcd858e66a74bee1c834e959" mac_openssl --if has_broken_mac_openssl >> /src/2.1.2.discourse &&\ + echo install_package "ruby-v_2_1_2_discourse" "https://github.com/SamSaffron/ruby/archive/v_2_1_2_discourse.tar.gz#98741e3cbfd00ae2931b2c0edb0f0698" ldflags_dirs standard verify_openssl >> /src/2.1.2.discourse &&\ apt-get -y install ruby bison &&\ - ruby-build /src/2.1.1.discourse /usr/local &&\ + ruby-build /src/2.1.2.discourse /usr/local &&\ apt-get -y remove ruby1.8 &&\ gem update --system &&\ gem install bundler &&\ diff --git a/image/discourse_21/Dockerfile b/image/discourse_21/Dockerfile index b945c82..666cb9e 100644 --- a/image/discourse_21/Dockerfile +++ b/image/discourse_21/Dockerfile @@ -1,4 +1,4 @@ -FROM samsaffron/discourse_base_21:1.0 +FROM samsaffron/discourse_base_21:2.1.2 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" -- 2.25.1