You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2018/11/25 15:37:09 UTC
[pulsar] branch master updated: Update libcurl version included in
docker images (#3035)
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/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 7bbcc72 Update libcurl version included in docker images (#3035)
7bbcc72 is described below
commit 7bbcc72f5a2690da701c299856ff0d2b62eed5d9
Author: massakam <ma...@yahoo-corp.jp>
AuthorDate: Mon Nov 26 00:37:04 2018 +0900
Update libcurl version included in docker images (#3035)
* Update libcurl version included in docker images
* Drop python 3.3 support
---
pulsar-client-cpp/docker/Dockerfile | 8 ++++----
pulsar-client-cpp/docker/build-wheels.sh | 1 -
pulsar-client-cpp/docker/create-images.sh | 1 -
pulsar-client-cpp/docker/push-images.sh | 1 -
pulsar-client-cpp/pkg/deb/Dockerfile | 8 ++++----
pulsar-client-cpp/pkg/rpm/Dockerfile | 8 ++++----
6 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/pulsar-client-cpp/docker/Dockerfile b/pulsar-client-cpp/docker/Dockerfile
index 1df8459..cd2bff1 100644
--- a/pulsar-client-cpp/docker/Dockerfile
+++ b/pulsar-client-cpp/docker/Dockerfile
@@ -134,12 +134,12 @@ RUN curl -O -L https://github.com/open-source-parsers/jsoncpp/archive/1.8.0.tar
rm -rf /1.8.0.tar.gz /jsoncpp-1.8.0
# LibCurl
-RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_58_0/curl-7.58.0.tar.gz && \
- tar xvfz curl-7.58.0.tar.gz && \
- cd curl-7.58.0 && \
+RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_61_0/curl-7.61.0.tar.gz && \
+ tar xvfz curl-7.61.0.tar.gz && \
+ cd curl-7.61.0 && \
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ && \
make && make install && \
- rm -rf /curl-7.58.0.tar.gz /curl-7.58.0
+ rm -rf /curl-7.61.0.tar.gz /curl-7.61.0
RUN pip install twine
diff --git a/pulsar-client-cpp/docker/build-wheels.sh b/pulsar-client-cpp/docker/build-wheels.sh
index 3292519..e4d6b25 100755
--- a/pulsar-client-cpp/docker/build-wheels.sh
+++ b/pulsar-client-cpp/docker/build-wheels.sh
@@ -29,7 +29,6 @@ cd $ROOT_DIR
PYTHON_VERSIONS=(
'2.7 cp27-cp27mu'
'2.7 cp27-cp27m'
- '3.3 cp33-cp33m'
'3.4 cp34-cp34m'
'3.5 cp35-cp35m'
'3.6 cp36-cp36m'
diff --git a/pulsar-client-cpp/docker/create-images.sh b/pulsar-client-cpp/docker/create-images.sh
index 1641e83..5d17f22 100755
--- a/pulsar-client-cpp/docker/create-images.sh
+++ b/pulsar-client-cpp/docker/create-images.sh
@@ -26,7 +26,6 @@ set -e
PYTHON_VERSIONS=(
'2.7 cp27-cp27mu'
'2.7 cp27-cp27m'
- '3.3 cp33-cp33m'
'3.4 cp34-cp34m'
'3.5 cp35-cp35m'
'3.6 cp36-cp36m'
diff --git a/pulsar-client-cpp/docker/push-images.sh b/pulsar-client-cpp/docker/push-images.sh
index 5a542e0..9e37c98 100755
--- a/pulsar-client-cpp/docker/push-images.sh
+++ b/pulsar-client-cpp/docker/push-images.sh
@@ -28,7 +28,6 @@ DOCKER_ORG=apachepulsar
PYTHON_VERSIONS=(
'2.7 cp27-cp27mu'
'2.7 cp27-cp27m'
- '3.3 cp33-cp33m'
'3.4 cp34-cp34m'
'3.5 cp35-cp35m'
'3.6 cp36-cp36m'
diff --git a/pulsar-client-cpp/pkg/deb/Dockerfile b/pulsar-client-cpp/pkg/deb/Dockerfile
index 117cbde..b446a21 100644
--- a/pulsar-client-cpp/pkg/deb/Dockerfile
+++ b/pulsar-client-cpp/pkg/deb/Dockerfile
@@ -72,12 +72,12 @@ RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz
rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j
# LibCurl
-RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_58_0/curl-7.58.0.tar.gz && \
- tar xvfz curl-7.58.0.tar.gz && \
- cd curl-7.58.0 && \
+RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_61_0/curl-7.61.0.tar.gz && \
+ tar xvfz curl-7.61.0.tar.gz && \
+ cd curl-7.61.0 && \
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ && \
make && make install && \
- rm -rf /curl-7.58.0.tar.gz /curl-7.58.0
+ rm -rf /curl-7.61.0.tar.gz /curl-7.61.0
RUN apt-get install -y dpkg-dev
diff --git a/pulsar-client-cpp/pkg/rpm/Dockerfile b/pulsar-client-cpp/pkg/rpm/Dockerfile
index 05cf898..43a7454 100644
--- a/pulsar-client-cpp/pkg/rpm/Dockerfile
+++ b/pulsar-client-cpp/pkg/rpm/Dockerfile
@@ -72,11 +72,11 @@ RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz
rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j
# LibCurl
-RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_58_0/curl-7.58.0.tar.gz && \
- tar xvfz curl-7.58.0.tar.gz && \
- cd curl-7.58.0 && \
+RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_61_0/curl-7.61.0.tar.gz && \
+ tar xvfz curl-7.61.0.tar.gz && \
+ cd curl-7.61.0 && \
CFLAGS=-fPIC ./configure --with-ssl=/usr/local/ssl/ && \
make && make install && \
- rm -rf /curl-7.58.0.tar.gz /curl-7.58.0
+ rm -rf /curl-7.61.0.tar.gz /curl-7.61.0
ENV OPENSSL_ROOT_DIR /usr/local/ssl/