merlimat closed pull request #2032: Added custom compiled OpenSSL into docker
image for RPM/Deb
URL: https://github.com/apache/incubator-pulsar/pull/2032
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/pulsar-client-cpp/pkg/deb/Dockerfile
b/pulsar-client-cpp/pkg/deb/Dockerfile
index 8f538ece39..7740728d90 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 c321d07b81..2ff1288040 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
+
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
