This is an automated email from the ASF dual-hosted git repository. mmerli pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
commit 3fbe4ac72e33487a534acce4493a3be959195592 Author: Matteo Merli <[email protected]> AuthorDate: Tue Jun 26 11:17:06 2018 -0700 Added custom compiled OpenSSL into docker image for RPM/Deb --- pulsar-client-cpp/pkg/deb/Dockerfile | 11 +++++++++-- pulsar-client-cpp/pkg/rpm/Dockerfile | 12 +++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pulsar-client-cpp/pkg/deb/Dockerfile b/pulsar-client-cpp/pkg/deb/Dockerfile index 8f538ec..7740728 100644 --- a/pulsar-client-cpp/pkg/deb/Dockerfile +++ b/pulsar-client-cpp/pkg/deb/Dockerfile @@ -21,8 +21,8 @@ FROM debian:9 - RUN apt-get update && \ - apt-get install -y curl g++ make libcurl4-openssl-dev libssl-dev python-dev \ +RUN apt-get update && \ + apt-get install -y curl g++ make python-dev \ libxml2-utils git # Download and compile boost @@ -64,6 +64,13 @@ RUN curl -O -L https://github.com/madler/zlib/archive/v1.2.11.tar.gz && \ make && make install && \ rm -rf /zlib-1.2.11.tar.gz /zlib-1.2.11 +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0h.tar.gz && \ + tar xvfz OpenSSL_1_1_0h.tar.gz && \ + cd openssl-OpenSSL_1_1_0h/ && \ + ./Configure -fPIC no-shared linux-x86_64 && \ + make && make install && \ + rm -rf /OpenSSL_1_1_0h.tar.gz /openssl-OpenSSL_1_1_0h + # LibCurl RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_54_0/curl-7.54.0.tar.gz && \ tar xvfz curl-7.54.0.tar.gz && \ diff --git a/pulsar-client-cpp/pkg/rpm/Dockerfile b/pulsar-client-cpp/pkg/rpm/Dockerfile index c321d07..2ff1288 100644 --- a/pulsar-client-cpp/pkg/rpm/Dockerfile +++ b/pulsar-client-cpp/pkg/rpm/Dockerfile @@ -23,7 +23,7 @@ FROM centos:7 RUN yum update && \ yum install -y gcc-c++ make cmake git rpm-build \ - python-devel openssl-devel openssl-static + python-devel createrepo # Download and compile boost RUN curl -O -L https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.gz && \ @@ -64,6 +64,13 @@ RUN curl -O -L https://github.com/madler/zlib/archive/v1.2.11.tar.gz && \ make && make install && \ rm -rf /zlib-1.2.11.tar.gz /zlib-1.2.11 +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0h.tar.gz && \ + tar xvfz OpenSSL_1_1_0h.tar.gz && \ + cd openssl-OpenSSL_1_1_0h/ && \ + ./Configure -fPIC no-shared linux-x86_64 && \ + make && make install && \ + rm -rf /OpenSSL_1_1_0h.tar.gz /openssl-OpenSSL_1_1_0h + # LibCurl RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_54_0/curl-7.54.0.tar.gz && \ tar xvfz curl-7.54.0.tar.gz && \ @@ -72,6 +79,5 @@ RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_54_0/curl- make && make install && \ rm -rf /curl-7.54.0.tar.gz /curl-7.54.0 -ADD build-rpm.sh / -RUN yum install -y createrepo +
