From: Sam <sam.saffron@gmail.com>
Date: Fri, 28 Jul 2017 13:48:25 +0000 (-0400)
Subject: downgrade ruby to 2.3.4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2de1048e4e82ef024fb25118bb8b246f25cd948b;p=discourse_docker.git

downgrade ruby to 2.3.4
upgrade nginx to latest stable
---

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 160a4d8..4347763 100644
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -72,13 +72,14 @@ RUN mkdir /lockless && cd /lockless && curl -O https://locklessinc.com/downloads
       tar zxf lockless_allocator_linux.tgz && mv lockless_allocator_linux/64bit/libllalloc.so.1.4 /usr/lib &&\
       cd / && rm -rf /lockless
 
+ADD rb_thread_fd_close.patch /tmp/rb_thread_fd_close.patch
 RUN 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.4.1 /usr/local
+    cd / && rm -rf /src/ruby-build && (ruby-build 2.3.4 /usr/local --patch << /tmp/rb_thread_fd_close.patch)
 
 RUN gem install bundler &&\
-    rm -rf /usr/local/share/ri/2.4.1/system &&\
+    rm -rf /usr/local/share/ri/2.3.4/system &&\
     cd / && git clone https://github.com/SamSaffron/pups.git
 
 ADD install-imagemagick /tmp/install-imagemagick
diff --git a/image/base/install-nginx b/image/base/install-nginx
index eb61843..e252ecf 100755
--- a/image/base/install-nginx
+++ b/image/base/install-nginx
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-VERSION=1.11.6
+VERSION=1.12.1
 cd /tmp
 
 apt-get install -y autoconf
diff --git a/image/base/rb_thread_fd_close.patch b/image/base/rb_thread_fd_close.patch
new file mode 100644
index 0000000..07c2563
--- /dev/null
+++ b/image/base/rb_thread_fd_close.patch
@@ -0,0 +1,15 @@
+--- branches/ruby_2_3/thread.c	2017/04/09 11:53:53	58288
++++ branches/ruby_2_3/thread.c	2017/04/09 13:26:01	58289
+@@ -2187,6 +2187,12 @@
+     return busy;
+ }
+ 
++void
++rb_thread_fd_close(int fd)
++{
++    while (rb_notify_fd_close(fd));
++}
++
+ /*
+  *  call-seq:
+  *     thr.raise