tool/ruby-openssl-docker: update to latest versionsky/docker-image-update-201808

4 files changed, 46 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 1342da6d..e6b18af3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,14 +18,17 @@ matrix:
   fast_finish: true
   include:
     - env: RUBY_VERSION=ruby-2.3 OPENSSL_VERSION=openssl-1.0.2
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.0
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.1
     - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.2
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.1.0
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.3
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.4
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.5
-    - env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.6
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.0
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.1
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.2
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.0
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.3
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.4
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.5
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.6
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.7
     - language: ruby
       rvm: ruby-head
       before_install:
@@ -36,3 +39,4 @@ matrix:
   allow_failures:
     - language: ruby
       rvm: ruby-head
+    - env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1
diff --git a/Dockerfile b/Dockerfile
index ab7f09e2..fbf4acec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1 +1 @@
-FROM zzak/ruby-openssl-docker:2.0
+FROM zzak/ruby-openssl-docker:testing
diff --git a/tool/ruby-openssl-docker/Dockerfile b/tool/ruby-openssl-docker/Dockerfile
index b8ed4bca..4e28493a 100644
--- a/tool/ruby-openssl-docker/Dockerfile
+++ b/tool/ruby-openssl-docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   autoconf \
@@ -29,21 +29,29 @@ RUN curl -s https://www.openssl.org/source/openssl-1.0.1u.tar.gz | tar -C /build
       shared linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.0.2l.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.0.2l && \
+RUN curl -s https://www.openssl.org/source/openssl-1.0.2o.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.0.2o && \
     ./Configure \
       --openssldir=/opt/openssl/openssl-1.0.2 \
       shared linux-x86_64 && \
     make && make install_sw
 
-RUN curl -s https://www.openssl.org/source/openssl-1.1.0f.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/openssl-1.1.0f && \
+RUN curl -s https://www.openssl.org/source/openssl-1.1.0h.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.1.0h && \
     ./Configure \
       --prefix=/opt/openssl/openssl-1.1.0 \
       enable-crypto-mdebug enable-crypto-mdebug-backtrace \
       linux-x86_64 && \
     make && make install_sw
 
+RUN curl -s https://www.openssl.org/source/openssl-1.1.1-pre8.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/openssl-1.1.1-pre8 && \
+    ./Configure \
+      --prefix=/opt/openssl/openssl-1.1.1 \
+      enable-crypto-mdebug enable-crypto-mdebug-backtrace \
+      linux-x86_64 && \
+    make && make install_sw
+
 # Supported libressl versions: 2.3-
 RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.10.tar.gz | tar -C /build/openssl -xzf - && \
     cd /build/openssl/libressl-2.3.10 && \
@@ -63,30 +71,44 @@ RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.5.5.tar.gz |
       --prefix=/opt/openssl/libressl-2.5 && \
     make && make install
 
-RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.1.tar.gz | tar -C /build/openssl -xzf - && \
-    cd /build/openssl/libressl-2.6.1 && \
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.5.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/libressl-2.6.5 && \
     ./configure \
       --prefix=/opt/openssl/libressl-2.6 && \
     make && make install
 
+RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.4.tar.gz | tar -C /build/openssl -xzf - && \
+    cd /build/openssl/libressl-2.7.4 && \
+    ./configure \
+      --prefix=/opt/openssl/libressl-2.7 && \
+    make && make install
+
 # 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.5.tar.gz | tar -C /build/ruby -xzf - && \
-    cd /build/ruby/ruby-2.3.5 && \
+RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.7.tar.gz | tar -C /build/ruby -xzf - && \
+    cd /build/ruby/ruby-2.3.7 && \
     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.2.tar.gz | tar -C /build/ruby -xzf - && \
-    cd /build/ruby/ruby-2.4.2 && \
+RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.4.tar.gz | tar -C /build/ruby -xzf - && \
+    cd /build/ruby/ruby-2.4.4 && \
     autoconf && ./configure \
       --without-openssl \
       --prefix=/opt/ruby/ruby-2.4 \
       --disable-install-doc && \
     make && make install
 
+RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz | tar -C /build/ruby -xzf - && \
+    cd /build/ruby/ruby-2.5.1 && \
+    autoconf && ./configure \
+      --without-openssl \
+      --prefix=/opt/ruby/ruby-2.5 \
+      --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 4d97e28c..a6bc6607 100755
--- a/tool/ruby-openssl-docker/init.sh
+++ b/tool/ruby-openssl-docker/init.sh
@@ -2,7 +2,7 @@
 
 if [[ "$RUBY_VERSION" = "" ]]
 then
-  RUBY_VERSION=ruby-2.4
+  RUBY_VERSION=ruby-2.5
 fi
 
 if [[ "$OPENSSL_VERSION" = "" ]]