From ddf77f732f8a9fbd5c048c531a5fbc942e7438b5 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 16 May 2016 10:25:28 +0800 Subject: [PATCH] Bump Ruby version to 2.3.1. --- image/base/Dockerfile | 4 ++-- image/discourse_fast_switch/Dockerfile | 4 ++-- image/discourse_fast_switch/create_switch.rb | 2 +- image/discourse_test/Dockerfile | 4 ++-- templates/web.template.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index e3c463a..2929e35 100644 --- 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 d06d62c..c20d9bc 100644 --- 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 ecb6e06..7f37b8c 100644 --- 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 1799fec..278ef0e 100644 --- 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 56e8a41..f174568 100644 --- 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: -- 2.25.1