Skip to content

Commit 75a8ccc

Browse files
SamSaffronEduardo Poleo
authored andcommitted
FEATURE: update base image to Ruby 2.6.1
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. github/ruby#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
1 parent fb57109 commit 75a8ccc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

image/base/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,13 @@ RUN apt-get -y install ruby &&\
6868
echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
6969
mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
7070
cd /src/ruby-build && ./install.sh &&\
71-
cd / && rm -rf /src/ruby-build && (ruby-build 2.5.2 /usr/local) &&\
71+
cd / && rm -rf /src/ruby-build && (ruby-build 2.6.1 /usr/local) &&\
7272
apt-get -y remove ruby
7373

7474
RUN gem update --system
7575

7676
RUN gem install bundler --force &&\
77-
rm -rf /usr/local/share/ri/2.5.2/system &&\
77+
rm -rf /usr/local/share/ri/2.6.1/system &&\
7878
cd / && git clone https://github.com/discourse/pups.git
7979

8080
ADD install-redis /tmp/install-redis

0 commit comments

Comments
 (0)