From 1ed6730f604bc3c0b6fc3a656597ef68557d1814 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 22 Sep 2015 11:56:22 +1000 Subject: [PATCH] upgrade rubies, get ready for new image --- cids/.gitkeep | 0 image/base/Dockerfile | 7 ++----- image/base_22/Dockerfile | 16 ---------------- image/build.rb | 2 +- image/discourse/Dockerfile | 4 ++-- image/discourse_fast_switch/Dockerfile | 10 +++++----- 6 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 cids/.gitkeep delete mode 100644 image/base_22/Dockerfile diff --git a/cids/.gitkeep b/cids/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/image/base/Dockerfile b/image/base/Dockerfile index d820081..bca7399 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -2,7 +2,7 @@ # When new LTS ships we can upgrade # NAME: discourse_base -# VERSION: 1.0.12 +# VERSION: 1.0.13 FROM ubuntu:14.04 @@ -84,7 +84,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test &&\ echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\ 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 && ruby-build 2.0.0-p645 /usr/local &&\ + cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p647 /usr/local &&\ gem update --system &&\ gem install bundler &&\ rm -rf /usr/local/share/ri/2.0.0/system &&\ @@ -102,6 +102,3 @@ ADD boot /sbin/boot ADD cron /etc/service/cron/run ADD rsyslog /etc/service/rsyslog/run - -# this is temporary, remove in 2015 -RUN cp /sbin/boot /sbin/runit diff --git a/image/base_22/Dockerfile b/image/base_22/Dockerfile deleted file mode 100644 index 158b512..0000000 --- a/image/base_22/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# Official repo only has a ppa for postgresql 9.3 at the moment (14/3/2014) -# When new LTS ships we can upgrade - -# VERSION 1.0.12 -FROM samsaffron/discourse_base:1.0.12 - -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#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 &&\ - gem install bundler &&\ - rm -fr /src/ruby-build diff --git a/image/build.rb b/image/build.rb index e7cf8ff..b1c5ffa 100644 --- a/image/build.rb +++ b/image/build.rb @@ -2,7 +2,7 @@ # require 'pty' -$version = "1.0.12" +$version = "1.0.13" $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.0.11/docker-squash-linux-amd64-v0.0.11.tar.gz" diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile index 90eee72..727c7cd 100644 --- a/image/discourse/Dockerfile +++ b/image/discourse/Dockerfile @@ -1,5 +1,5 @@ -# Current version 1.0.12 -FROM samsaffron/discourse_base:1.0.12 +# Current version 1.0.13 +FROM samsaffron/discourse_base:1.0.13 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index c1a8267..367f13e 100644 --- a/image/discourse_fast_switch/Dockerfile +++ b/image/discourse_fast_switch/Dockerfile @@ -1,16 +1,16 @@ # Allow to easily switch Ruby version in images that derive off this -FROM samsaffron/discourse:1.0.12 +FROM samsaffron/discourse:1.0.13 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#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.2-github &&\ - ruby-build /src/2.2.2-github /usr/ruby_22 &&\ + 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.3-github &&\ + echo install_package "ruby-2.2.3-github" "https://github.com/SamSaffron/ruby/archive/2.2.3-github.tar.gz#46aeee28ead1038cf615b17672ad6e54" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.3-github &&\ + ruby-build /src/2.2.3-github /usr/ruby_22 &&\ apt-get -y remove ruby -RUN cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p643 /usr/ruby_20 +RUN cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p647 /usr/ruby_20 ADD create_switch.rb /src/create_switch.rb RUN ruby /src/create_switch.rb -- 2.25.1