This is an automated email from the ASF dual-hosted git repository.
jking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 75bac10 THRIFT-4690: update bionic docker image to use upstream
deimos OpenSSL 1.1 tag for dlang
75bac10 is described below
commit 75bac10dbd8d953bb2f556b7dcc3bdf7518e67a6
Author: James E. King III <[email protected]>
AuthorDate: Sun Dec 30 16:20:12 2018 -0500
THRIFT-4690: update bionic docker image to use upstream deimos OpenSSL 1.1
tag for dlang
---
build/docker/ubuntu-bionic/Dockerfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build/docker/ubuntu-bionic/Dockerfile
b/build/docker/ubuntu-bionic/Dockerfile
index a8c1417..4f53ca4 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -113,10 +113,10 @@ RUN \
mv libevent-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
mv libevent-master/C/* /usr/include/dmd/druntime/import/C/ && \
rm -rf libevent-master && \
- curl -sSL https://github.com/jeking3/openssl/archive/tls_method.tar.gz|
tar xz && \
- mv openssl-tls_method/deimos/* /usr/include/dmd/druntime/import/deimos/ &&
\
- mv openssl-tls_method/C/* /usr/include/dmd/druntime/import/C/ && \
- rm -rf openssl-tls_method
+ git clone -b 'v2.0.0+1.1.0h'
https://github.com/D-Programming-Deimos/openssl.git deimos-openssl-1.1.0h && \
+ mv deimos-openssl-1.1.0h/deimos/* /usr/include/dmd/druntime/import/deimos/
&& \
+ mv deimos-openssl-1.1.0h/C/* /usr/include/dmd/druntime/import/C/ && \
+ rm -rf deimos-openssl-1.1.0h
RUN apt-get install -y --no-install-recommends \
`# Dart dependencies` \
