Skip to content

Commit 13dc364

Browse files
committed
tool/ruby-openssl-docker: update to latest versions
1 parent 1f90516 commit 13dc364

File tree

4 files changed

+46
-20
lines changed

4 files changed

+46
-20
lines changed

.travis.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ matrix:
1818
fast_finish: true
1919
include:
2020
- env: RUBY_VERSION=ruby-2.3 OPENSSL_VERSION=openssl-1.0.2
21-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.0
22-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.1
2321
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.0.2
24-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=openssl-1.1.0
25-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.3
26-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.4
27-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.5
28-
- env: RUBY_VERSION=ruby-2.4 OPENSSL_VERSION=libressl-2.6
22+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.0
23+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.1
24+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.0.2
25+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.0
26+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1
27+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.3
28+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.4
29+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.5
30+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.6
31+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=libressl-2.7
2932
- language: ruby
3033
rvm: ruby-head
3134
before_install:
@@ -36,3 +39,4 @@ matrix:
3639
allow_failures:
3740
- language: ruby
3841
rvm: ruby-head
42+
- env: RUBY_VERSION=ruby-2.5 OPENSSL_VERSION=openssl-1.1.1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM zzak/ruby-openssl-docker:2.0
1+
FROM zzak/ruby-openssl-docker:testing

tool/ruby-openssl-docker/Dockerfile

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:18.04
22

33
RUN apt-get update && apt-get install -y --no-install-recommends \
44
autoconf \
@@ -29,21 +29,29 @@ RUN curl -s https://www.openssl.org/source/openssl-1.0.1u.tar.gz | tar -C /build
2929
shared linux-x86_64 && \
3030
make && make install_sw
3131

32-
RUN curl -s https://www.openssl.org/source/openssl-1.0.2l.tar.gz | tar -C /build/openssl -xzf - && \
33-
cd /build/openssl/openssl-1.0.2l && \
32+
RUN curl -s https://www.openssl.org/source/openssl-1.0.2o.tar.gz | tar -C /build/openssl -xzf - && \
33+
cd /build/openssl/openssl-1.0.2o && \
3434
./Configure \
3535
--openssldir=/opt/openssl/openssl-1.0.2 \
3636
shared linux-x86_64 && \
3737
make && make install_sw
3838

39-
RUN curl -s https://www.openssl.org/source/openssl-1.1.0f.tar.gz | tar -C /build/openssl -xzf - && \
40-
cd /build/openssl/openssl-1.1.0f && \
39+
RUN curl -s https://www.openssl.org/source/openssl-1.1.0h.tar.gz | tar -C /build/openssl -xzf - && \
40+
cd /build/openssl/openssl-1.1.0h && \
4141
./Configure \
4242
--prefix=/opt/openssl/openssl-1.1.0 \
4343
enable-crypto-mdebug enable-crypto-mdebug-backtrace \
4444
linux-x86_64 && \
4545
make && make install_sw
4646

47+
RUN curl -s https://www.openssl.org/source/openssl-1.1.1-pre8.tar.gz | tar -C /build/openssl -xzf - && \
48+
cd /build/openssl/openssl-1.1.1-pre8 && \
49+
./Configure \
50+
--prefix=/opt/openssl/openssl-1.1.1 \
51+
enable-crypto-mdebug enable-crypto-mdebug-backtrace \
52+
linux-x86_64 && \
53+
make && make install_sw
54+
4755
# Supported libressl versions: 2.3-
4856
RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.10.tar.gz | tar -C /build/openssl -xzf - && \
4957
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 |
6371
--prefix=/opt/openssl/libressl-2.5 && \
6472
make && make install
6573

66-
RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.1.tar.gz | tar -C /build/openssl -xzf - && \
67-
cd /build/openssl/libressl-2.6.1 && \
74+
RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.6.5.tar.gz | tar -C /build/openssl -xzf - && \
75+
cd /build/openssl/libressl-2.6.5 && \
6876
./configure \
6977
--prefix=/opt/openssl/libressl-2.6 && \
7078
make && make install
7179

80+
RUN curl -s http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.7.4.tar.gz | tar -C /build/openssl -xzf - && \
81+
cd /build/openssl/libressl-2.7.4 && \
82+
./configure \
83+
--prefix=/opt/openssl/libressl-2.7 && \
84+
make && make install
85+
7286
# Supported Ruby versions: 2.3-
7387
RUN mkdir -p /build/ruby
74-
RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.5.tar.gz | tar -C /build/ruby -xzf - && \
75-
cd /build/ruby/ruby-2.3.5 && \
88+
RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.7.tar.gz | tar -C /build/ruby -xzf - && \
89+
cd /build/ruby/ruby-2.3.7 && \
7690
autoconf && ./configure \
7791
--without-openssl \
7892
--prefix=/opt/ruby/ruby-2.3 \
7993
--disable-install-doc && \
8094
make && make install
8195

82-
RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.2.tar.gz | tar -C /build/ruby -xzf - && \
83-
cd /build/ruby/ruby-2.4.2 && \
96+
RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.4/ruby-2.4.4.tar.gz | tar -C /build/ruby -xzf - && \
97+
cd /build/ruby/ruby-2.4.4 && \
8498
autoconf && ./configure \
8599
--without-openssl \
86100
--prefix=/opt/ruby/ruby-2.4 \
87101
--disable-install-doc && \
88102
make && make install
89103

104+
RUN curl -s https://cache.ruby-lang.org/pub/ruby/2.5/ruby-2.5.1.tar.gz | tar -C /build/ruby -xzf - && \
105+
cd /build/ruby/ruby-2.5.1 && \
106+
autoconf && ./configure \
107+
--without-openssl \
108+
--prefix=/opt/ruby/ruby-2.5 \
109+
--disable-install-doc && \
110+
make && make install
111+
90112
ONBUILD ADD . /home/openssl/code
91113
ONBUILD WORKDIR /home/openssl/code
92114

tool/ruby-openssl-docker/init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if [[ "$RUBY_VERSION" = "" ]]
44
then
5-
RUBY_VERSION=ruby-2.4
5+
RUBY_VERSION=ruby-2.5
66
fi
77

88
if [[ "$OPENSSL_VERSION" = "" ]]

0 commit comments

Comments
 (0)