You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2018/09/28 14:27:09 UTC

[thrift] branch master updated: fix Ubuntu Xenial docker build environment (lock deimos for openssl to older version)

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 98acf18  fix Ubuntu Xenial docker build environment (lock deimos for openssl to older version)
98acf18 is described below

commit 98acf189a78c3c6a78cf27c35450e1876d6500d5
Author: James E. King III <jk...@apache.org>
AuthorDate: Wed Sep 26 14:34:34 2018 +0000

    fix Ubuntu Xenial docker build environment (lock deimos for openssl to older version)
---
 build/docker/ubuntu-xenial/Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/docker/ubuntu-xenial/Dockerfile b/build/docker/ubuntu-xenial/Dockerfile
index c69bec2..c745a59 100644
--- a/build/docker/ubuntu-xenial/Dockerfile
+++ b/build/docker/ubuntu-xenial/Dockerfile
@@ -115,10 +115,10 @@ RUN mkdir -p /usr/include/dmd/druntime/import/deimos /usr/include/dmd/druntime/i
     mv libevent-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
     mv libevent-master/C/* /usr/include/dmd/druntime/import/C/ && \
     rm -rf libevent-master
-RUN curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/master.tar.gz| tar xz && \
-    mv openssl-master/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
-    mv openssl-master/C/* /usr/include/dmd/druntime/import/C/ && \
-    rm -rf openssl-master
+RUN curl -sSL https://github.com/D-Programming-Deimos/openssl/archive/v1.1.6+1.0.1g.tar.gz | tar xz && \
+    mv openssl-1.1.6-1.0.1g/deimos/* /usr/include/dmd/druntime/import/deimos/ && \
+    mv openssl-1.1.6-1.0.1g/C/* /usr/include/dmd/druntime/import/C/ && \
+    rm -rf openssl-1.1.6-1.0.1g
 
 RUN apt-get install -y --no-install-recommends \
 `# Dart dependencies` \