From 346f5d34c0086b3ccbbcaa14d0c1f16c1733170f Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 16 Apr 2015 11:51:14 +1000 Subject: [PATCH] update ruby 2.2 to latest --- image/base_22/Dockerfile | 6 +++--- image/discourse_fast_switch/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/image/base_22/Dockerfile b/image/base_22/Dockerfile index 6c8844b..a0adc09 100644 --- a/image/base_22/Dockerfile +++ b/image/base_22/Dockerfile @@ -1,14 +1,14 @@ # Official repo only has a ppa for postgresql 9.3 at the moment (14/3/2014) # When new LTS ships we can upgrade -# VERSION 0.1.0 -FROM samsaffron/discourse_base:1.0.9 +# VERSION 1.0.11 +FROM samsaffron/discourse_base:1.0.11 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" RUN apt-get -y install ruby bison autoconf &&\ echo install_package "openssl-1.0.1l" "https://www.openssl.org/source/openssl-1.0.1l.tar.gz#b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4" mac_openssl --if has_broken_mac_openssl > /src/2.2.2-github &&\ - echo install_package "ruby-2.2.2-github" "https://github.com/SamSaffron/ruby/archive/2.2.2-github.tar.gz#407654b4fe9dd61ca7e26d8d7e4c8631" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\ + echo install_package "ruby-2.2.2-github" "https://github.com/SamSaffron/ruby/archive/2.2.2-github.tar.gz#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\ ruby-build /src/2.2.2-github /usr/local &&\ apt-get -y remove ruby &&\ gem update --system &&\ diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index 3b5ed96..0e2d58e 100644 --- a/image/discourse_fast_switch/Dockerfile +++ b/image/discourse_fast_switch/Dockerfile @@ -6,7 +6,7 @@ MAINTAINER Sam Saffron "https://twitter.com/samsaffron" RUN apt-get -y install ruby bison autoconf &&\ echo install_package "openssl-1.0.1l" "https://www.openssl.org/source/openssl-1.0.1l.tar.gz#b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4" mac_openssl --if has_broken_mac_openssl > /src/2.2.2-github &&\ - echo install_package "ruby-2.2.2-github" "https://github.com/SamSaffron/ruby/archive/2.2.2-github.tar.gz#407654b4fe9dd61ca7e26d8d7e4c8631" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\ + echo install_package "ruby-2.2.2-github" "https://github.com/SamSaffron/ruby/archive/2.2.2-github.tar.gz#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\ ruby-build /src/2.2.2-github /usr/ruby_22 &&\ apt-get -y remove ruby -- 2.25.1