Bump Ruby version to 2.3.1.

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index e3c463af0e8100e9e8f269d39333c5d16a4cb317..2929e3580a76a8df11c5c3a36a1ab9ef2612e223 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -81,10 +81,10 @@ 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-p647 /usr/local &&\
+    cd / && rm -rf /src/ruby-build && ruby-build 2.3.1 /usr/local &&\
     gem update --system &&\
     gem install bundler &&\
-    rm -rf /usr/local/share/ri/2.0.0/system &&\
+    rm -rf /usr/local/share/ri/2.3.1/system &&\
     cd / && git clone https://github.com/SamSaffron/pups.git
 
 # clean up for docker squash

diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile
index d06d62cb5b8269414d892e98a2a256a5a457bfda..c20d9bc0f3debab76fda6e526690a2692b6d39c3 100644 (file)
--- a/image/discourse_fast_switch/Dockerfile
+++ b/image/discourse_fast_switch/Dockerfile
@@ -1,6 +1,6 @@
 # Allow to easily switch Ruby version in images that derive off this
 
-FROM discourse/discourse:1.0.17
+FROM discourse/discourse:1.0.18
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
@@ -10,7 +10,7 @@ RUN apt-get -y install ruby bison autoconf &&\
     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-p647 /usr/ruby_20
+RUN cd / && rm -rf /src/ruby-build && ruby-build 2.3.1 /usr/ruby_23
 
 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 ecb6e0641ffa89a5da6ef7213943ce8fb711e0d5..7f37b8c19d7a28515c1cd630b470203478828bf6 100644 (file)
--- a/image/discourse_fast_switch/create_switch.rb
+++ b/image/discourse_fast_switch/create_switch.rb
@@ -9,7 +9,7 @@ end
 
 system("cd /var/www/discourse && git pull")
 
-['22','20'].each do |v|
+['22', '23'].each do |v|
 
   bin = "/usr/local/bin/use_#{v}"
 

diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile
index 1799feceabe9224cef87268d1c0a8a3487e75d5f..278ef0efe9f029f05feb118980eaef03501ab12e 100644 (file)
--- a/image/discourse_test/Dockerfile
+++ b/image/discourse_test/Dockerfile
@@ -1,8 +1,8 @@
-FROM discourse/discourse_fast_switch:1.0.17
+FROM discourse/discourse_fast_switch:1.0.18
 
 MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
 
-RUN use_22 &&\
+RUN use_23 &&\
       gem update bundler &&\
       cd /var/www/discourse &&\
       chown -R discourse . &&\

diff --git a/templates/web.template.yml b/templates/web.template.yml
index 56e8a4176ebbae26c97d8d352efdbe5d035e8de5..f174568120eba9d92b7156f3d8885ac14bada055 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -6,7 +6,7 @@ env:
   # slightly less aggressive than "recommendation" but works fine with oobgc
   RUBY_GC_MALLOC_LIMIT: 40000000
   # this ensures we have enough heap space to handle a big pile of small reqs
-  RUBY_HEAP_MIN_SLOTS: 800000
+  RUBY_GC_HEAP_INIT_SLOTS: 800000
 
   DISCOURSE_DB_SOCKET: /var/run/postgresql
   DISCOURSE_DB_HOST: