From c75e835fd70b614c662811557a8b1b50d6cf8c41 Mon Sep 17 00:00:00 2001
From: Kazuki Yamaguchi <k@rhe.jp>
Date: Sat, 21 Jan 2017 01:59:55 +0900
Subject: ruby-openssl-docker: update versions of Ruby and OpenSSL

Ruby 2.3.3/2.4.0, OpenSSL 1.0.2k/1.1.0d and LibreSSL 2.3.9/2.4.4.
---
 tool/ruby-openssl-docker/Dockerfile | 42 ++++++++++++++++++++++---------------
 tool/ruby-openssl-docker/init.sh    |  4 ++--
 2 files changed, 27 insertions(+), 19 deletions(-)

(limited to 'tool')

diff --git a/tool/ruby-openssl-docker/Dockerfile b/tool/ruby-openssl-docker/Dockerfile
index a1518a9c..d22a7e43 100644
--- a/tool/ruby-openssl-docker/Dockerfile
+++ b/tool/ruby-openssl-docker/Dockerfile
@@ -19,46 +19,46 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   xz-utils \
   zlib1g-dev
 
-# Supported OpenSSL versions: 1.0.0, 1.0.1, 1.0.2, 1.1.0
+# Supported OpenSSL versions: 1.0.1-
 RUN mkdir -p /build/openssl
 RUN curl -s https://www.openssl.org/source/openssl-1.0.0t.tar.gz | tar -C /build/openssl -xzf - && \
     cd /build/openssl/openssl-1.0.0t && \
     ./Configure \
       --openssldir=/opt/openssl/openssl-1.0.0 \
-      shared debug-linux-x86_64 && \
+      shared linux-x86_64 && \
     make && make install_sw
 
 RUN curl -s https://www.openssl.org/source/openssl-1.0.1u.tar.gz | tar -C /build/openssl -xzf - && \
     cd /build/openssl/openssl-1.0.1u && \
     ./Configure \
       --openssldir=/opt/openssl/openssl-1.0.1 \
-      shared debug-linux-x86_64 && \
+      shared linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.0.2j.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.0.2j && \
+RUN curl -s https://www.openssl.org/source/openssl-1.0.2k.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.0.2k && \
     ./Configure \
       --openssldir=/opt/openssl/openssl-1.0.2 \
-      shared debug-linux-x86_64 && \
+      shared linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.1.0b.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.1.0b && \
+RUN curl -s https://www.openssl.org/source/openssl-1.1.0d.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.1.0d && \
     ./Configure \
       --prefix=/opt/openssl/openssl-1.1.0 \
       enable-crypto-mdebug enable-crypto-mdebug-backtrace \
-      debug-linux-x86_64 && \
+      linux-x86_64 && \
     make && make install_sw
 
-# Supported libressl versions: 2.3, 2.4, 2.5
-RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.8.tar.gz | tar -C /build/openssl -xzf -
-RUN cd /build/openssl/libressl-2.3.8 && \
+# Supported libressl versions: 2.3-
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.9.tar.gz | tar -C /build/openssl -xzf -
+RUN cd /build/openssl/libressl-2.3.9 && \
     ./configure \
       --prefix=/opt/openssl/libressl-2.3 && \
     make && make install
 
-RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.4.3.tar.gz | tar -C /build/openssl -xzf -
-RUN cd /build/openssl/libressl-2.4.3 && \
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.4.4.tar.gz | tar -C /build/openssl -xzf -
+RUN cd /build/openssl/libressl-2.4.4 && \
     ./configure \
       --prefix=/opt/openssl/libressl-2.4 && \
     make && make install
@@ -69,16 +69,24 @@ RUN cd /build/openssl/libressl-2.5.0 && \
       --prefix=/opt/openssl/libressl-2.5 && \
     make && make install
 
-# Supported Ruby versions: 2.3
+# Supported Ruby versions: 2.3-
 RUN mkdir -p /build/ruby
-RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.1.tar.gz | tar -C /build/ruby -xzf - && \
-    cd /build/ruby/ruby-2.3.1 && \
+RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.3.tar.gz | tar -C /build/ruby -xzf - && \
+    cd /build/ruby/ruby-2.3.3 && \
     autoconf && ./configure \
       --without-openssl \
       --prefix=/opt/ruby/ruby-2.3 \
       --disable-install-doc && \
     make && make install
 
+RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.0.tar.gz | tar -C /build/ruby -xzf - && \
+    cd /build/ruby/ruby-2.4.0 && \
+    autoconf && ./configure \
+      --without-openssl \
+      --prefix=/opt/ruby/ruby-2.4 \
+      --disable-install-doc && \
+    make && make install
+
 ONBUILD ADD . /home/openssl/code
 ONBUILD WORKDIR /home/openssl/code
 
diff --git a/tool/ruby-openssl-docker/init.sh b/tool/ruby-openssl-docker/init.sh
index c4301482..4d97e28c 100755
--- a/tool/ruby-openssl-docker/init.sh
+++ b/tool/ruby-openssl-docker/init.sh
@@ -2,12 +2,12 @@
 
 if [[ "$RUBY_VERSION" = "" ]]
 then
-  RUBY_VERSION=ruby-2.3
+  RUBY_VERSION=ruby-2.4
 fi
 
 if [[ "$OPENSSL_VERSION" = "" ]]
 then
-  OPENSSL_VERSION=openssl-1.0.2
+  OPENSSL_VERSION=openssl-1.1.0
 fi
 
 echo "Using Ruby ${RUBY_VERSION} with OpenSSL ${OPENSSL_VERSION}."
-- 
cgit v1.2.3