UPDATE to Ruby 2.1.2

diff --git a/image/base_21/Dockerfile b/image/base_21/Dockerfile
index b2b8a52861c5aaeb0c2acc07e0318564d7fb9a74..49fdf4411771d1eddb360050953e8aedf9a0b06a 100644 (file)
--- 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 b945c82317053c640571c872590e8d2d4590fa07..666cb9e549a9c153576943d560c0c6a2916271b0 100644 (file)
--- 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"