From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Wed, 6 Jun 2018 09:20:04 +0000 (+0800)
Subject: Release discourse:discourse_fast_switch:1.5.0.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7db04d295184106b35df9f7f838f5420e5c647c7;p=discourse_docker.git

Release discourse:discourse_fast_switch:1.5.0.

* Fast switch between Ruby 2.4.4 and Ruby 2.5.1
---

diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile
index e99466f..8939463 100644
--- a/image/discourse_fast_switch/Dockerfile
+++ b/image/discourse_fast_switch/Dockerfile
@@ -1,18 +1,23 @@
 # NAME:     discourse/discourse_fast_switch
-# VERSION:  1.4.0
+# VERSION:  1.5.0
 
 # Allow to easily switch Ruby version in images that derive off this
-FROM discourse/base:1.4.0
+FROM discourse/base:2.0.20180605
 
 #LABEL 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.3-github &&\
-    echo install_package "ruby-2.2.3-github" "https://github.com/SamSaffron/ruby/archive/2.2.3-github.tar.gz#fdc330e92f36bc4bd9bcc00915dde7d5" autoconf ldflags_dirs standard verify_openssl >> /src/2.2.3-github &&\
-    ruby-build /src/2.2.3-github /usr/ruby_22 &&\
+    cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
+    /src/ruby-build/install.sh &&\
+    sudo ruby-build 2.4.4 /usr/ruby_24 &&\
+    cp -R /usr/ruby_24/bin/* /usr/local/bin/ &&\
+    cp -R /usr/ruby_24/lib/* /usr/local/lib/ &&\
+    cp -R /usr/ruby_24/share/* /usr/local/share/ &&\
+    cp -R /usr/ruby_24/include/* /usr/local/include/ &&\
     apt-get -y remove ruby
 
-RUN cd / && rm -rf /src/ruby-build && ruby-build 2.3.1 /usr/ruby_23
+RUN cd / && ruby-build 2.5.1 /usr/ruby_25
 
 ADD create_switch.rb /src/create_switch.rb
+
 RUN ruby /src/create_switch.rb
diff --git a/image/discourse_fast_switch/create_switch.rb b/image/discourse_fast_switch/create_switch.rb
index 1db4072..43cde03 100644
--- a/image/discourse_fast_switch/create_switch.rb
+++ b/image/discourse_fast_switch/create_switch.rb
@@ -2,19 +2,13 @@ require 'fileutils'
 
 puts "-"*100,"creating switch","-"*100
 
-Dir.glob('/usr/ruby_20/*/**').each do |file|
-  file = file.gsub('/usr/ruby_20/', '/usr/local/')
-  FileUtils.rm(file) if File.exists?(file) && !File.directory?(file)
-end
-
 system("cd /var/www/discourse && git pull")
 
-['22', '23'].each do |v|
-
+['24', '25'].each do |v|
   bin = "/usr/local/bin/use_#{v}"
 
 File.write(bin, <<RUBY
-#!/usr/ruby_22/bin/ruby
+#!/usr/ruby_24/bin/ruby
 
 Dir.glob('/usr/ruby_#{v}/bin/*').each do |file|
   `rm -f /usr/local/bin/\#{File.basename(file)}`