This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new ca93d4a Added custom compiled OpenSSL into docker image for RPM/Deb
(#2032)
ca93d4a is described below
commit ca93d4a949ca06c0211be29c47c5c9b22fd91715
Author: Matteo Merli <[email protected]>
AuthorDate: Tue Jun 26 13:59:18 2018 -0700
Added custom compiled OpenSSL into docker image for RPM/Deb (#2032)
---
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
+
