FEATURE: update base image to Ruby 2.6.1
authorSam <sam.saffron@gmail.com>
Mon, 18 Feb 2019 02:27:38 +0000 (13:27 +1100)
committerSam <sam.saffron@gmail.com>
Mon, 18 Feb 2019 02:29:30 +0000 (13:29 +1100)
Due to https://meta.discourse.org/t/logster-2-1-0-causes-segfault-running-unicorn-in-discourse-dev-docker-image/109265
we are stuck upgrading base image.

https://github.com/github/ruby/pull/40 by @tenderlove is backported to 2.5
but we are still waiting on 2.5.4

To avoid a custom patch in our image I opted to move base to 2.6.1 and pick
up the fix direct from 2.6

image/base/Dockerfile

index 8e04bda540ec675ae32539e489df09bbebe4e1ca..4cfda1da227556bd8a30b7668ebdb53fe459e10c 100644 (file)
@@ -68,13 +68,13 @@ RUN apt-get -y install ruby &&\
     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.5.2 /usr/local) &&\
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.6.1 /usr/local) &&\
     apt-get -y remove ruby
 
 RUN gem update --system
 
 RUN gem install bundler --force &&\
-    rm -rf /usr/local/share/ri/2.5.2/system &&\
+    rm -rf /usr/local/share/ri/2.6.1/system &&\
     cd / && git clone https://github.com/discourse/pups.git
 
 ADD install-redis /tmp/install-redis