This is an automated email from the ASF dual-hosted git repository.
mattisonchao pushed a commit to branch branch-2.9
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.9 by this push:
new ea435d8dd3c [CI] Upgrade zlib version to 1.2.12 (#14964)
ea435d8dd3c is described below
commit ea435d8dd3cf753485e0a9cea06e0685287eaa3d
Author: Lishen Yao <[email protected]>
AuthorDate: Fri Apr 1 00:42:21 2022 +0800
[CI] Upgrade zlib version to 1.2.12 (#14964)
Co-authored-by: Zike Yang <[email protected]>
(cherry picked from commit 8b2b988654887cdb9d123698d5237381704f89c3)
---
pulsar-client-cpp/docker/alpine/Dockerfile | 8 ++++----
pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 | 8 ++++----
pulsar-client-cpp/docker/manylinux1/Dockerfile | 8 ++++----
pulsar-client-cpp/docker/manylinux2014/Dockerfile | 2 +-
pulsar-client-cpp/pkg/deb/Dockerfile | 8 ++++----
pulsar-client-cpp/pkg/licenses/LICENSE-zlib.txt | 4 ++--
pulsar-client-cpp/pkg/rpm/Dockerfile | 8 ++++----
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/pulsar-client-cpp/docker/alpine/Dockerfile
b/pulsar-client-cpp/docker/alpine/Dockerfile
index ef77284242c..12d1e2f9f97 100644
--- a/pulsar-client-cpp/docker/alpine/Dockerfile
+++ b/pulsar-client-cpp/docker/alpine/Dockerfile
@@ -43,12 +43,12 @@ RUN curl -O -L
https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/
rm -rf /boost_1_72_0.tar.gz /boost_1_72_0
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.11.tar.gz && \
- tar xfz zlib-1.2.11.tar.gz && \
- cd zlib-1.2.11 && \
+RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
+ tar xfz zlib-1.2.12.tar.gz && \
+ cd zlib-1.2.12 && \
CFLAGS="-fPIC -O3" ./configure && \
make -j4 && make install && \
- rm -rf /zlib-1.2.11.tar.gz /zlib-1.2.11
+ rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
# Compile OpenSSL
RUN curl -O -L
https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \
diff --git a/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
b/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
index 0a9fbb40711..862785e9015 100644
--- a/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
+++ b/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
@@ -43,12 +43,12 @@ RUN curl -O -L
https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/
rm -rf /boost_1_72_0.tar.gz /boost_1_72_0
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.11.tar.gz && \
- tar xfz zlib-1.2.11.tar.gz && \
- cd zlib-1.2.11 && \
+RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
+ tar xfz zlib-1.2.12.tar.gz && \
+ cd zlib-1.2.12 && \
CFLAGS="-fPIC -O3" ./configure && \
make -j4 && make install && \
- rm -rf /zlib-1.2.11.tar.gz /zlib-1.2.11
+ rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
# Compile OpenSSL
RUN curl -O -L
https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \
diff --git a/pulsar-client-cpp/docker/manylinux1/Dockerfile
b/pulsar-client-cpp/docker/manylinux1/Dockerfile
index 0df92401a8f..502c6f6fe77 100644
--- a/pulsar-client-cpp/docker/manylinux1/Dockerfile
+++ b/pulsar-client-cpp/docker/manylinux1/Dockerfile
@@ -46,12 +46,12 @@ RUN curl -O -L
https://www.cpan.org/src/5.0/perl-5.10.0.tar.gz && \
####################################
# ZLib
-RUN curl -O -L https://zlib.net/zlib-1.2.11.tar.gz && \
- tar xvfz zlib-1.2.11.tar.gz && \
- cd zlib-1.2.11 && \
+RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
+ tar xvfz zlib-1.2.12.tar.gz && \
+ cd zlib-1.2.12 && \
CFLAGS="-fPIC -O3" ./configure && \
make && make install && \
- rm -rf /zlib-1.2.11.tar.gz /zlib-1.2.11
+ rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
# Compile OpenSSL
RUN curl -O -L
https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \
diff --git a/pulsar-client-cpp/docker/manylinux2014/Dockerfile
b/pulsar-client-cpp/docker/manylinux2014/Dockerfile
index 5bc1b0315ed..4d1cfeef92b 100644
--- a/pulsar-client-cpp/docker/manylinux2014/Dockerfile
+++ b/pulsar-client-cpp/docker/manylinux2014/Dockerfile
@@ -52,7 +52,7 @@ RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \
tar xvfz zlib-1.2.12.tar.gz && \
cd zlib-1.2.12 && \
CFLAGS="-fPIC -O3" ./configure && \
- make -j8 && make install && \
+ make && make install && \
rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12
# Compile OpenSSL
diff --git a/pulsar-client-cpp/pkg/deb/Dockerfile
b/pulsar-client-cpp/pkg/deb/Dockerfile
index 77c3f470c06..1925827b56a 100644
--- a/pulsar-client-cpp/pkg/deb/Dockerfile
+++ b/pulsar-client-cpp/pkg/deb/Dockerfile
@@ -49,12 +49,12 @@ RUN curl -O -L
https://github.com/google/protobuf/releases/download/v3.3.0/prot
rm -rf /protobuf-cpp-3.3.0.tar.gz /protobuf-3.3.0
# ZLib
-RUN curl -O -L https://github.com/madler/zlib/archive/v1.2.11.tar.gz && \
- tar xvfz v1.2.11.tar.gz && \
- cd zlib-1.2.11 && \
+RUN curl -O -L https://github.com/madler/zlib/archive/v1.2.12.tar.gz && \
+ tar xvfz v1.2.12.tar.gz && \
+ cd zlib-1.2.12 && \
CFLAGS="-fPIC -O3" ./configure && \
make && make install && \
- rm -rf /v1.2.11.tar.gz /zlib-1.2.11
+ rm -rf /v1.2.12.tar.gz /zlib-1.2.12
# Zstandard
RUN curl -O -L
https://github.com/facebook/zstd/releases/download/v1.3.7/zstd-1.3.7.tar.gz && \
diff --git a/pulsar-client-cpp/pkg/licenses/LICENSE-zlib.txt
b/pulsar-client-cpp/pkg/licenses/LICENSE-zlib.txt
index cf25d04b7e1..f1f93cd6a6a 100644
--- a/pulsar-client-cpp/pkg/licenses/LICENSE-zlib.txt
+++ b/pulsar-client-cpp/pkg/licenses/LICENSE-zlib.txt
@@ -1,7 +1,7 @@
zlib.h -- interface of the 'zlib' general purpose compression library
- version 1.2.11, January 15th, 2017
+ version 1.2.12, March 27th, 2022
- Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+ Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
diff --git a/pulsar-client-cpp/pkg/rpm/Dockerfile
b/pulsar-client-cpp/pkg/rpm/Dockerfile
index c2406c5c7d3..e83290dccca 100644
--- a/pulsar-client-cpp/pkg/rpm/Dockerfile
+++ b/pulsar-client-cpp/pkg/rpm/Dockerfile
@@ -49,12 +49,12 @@ RUN curl -O -L
https://github.com/google/protobuf/releases/download/v3.3.0/prot
rm -rf /protobuf-cpp-3.3.0.tar.gz /protobuf-3.3.0
# ZLib
-RUN curl -O -L https://github.com/madler/zlib/archive/v1.2.11.tar.gz && \
- tar xvfz v1.2.11.tar.gz && \
- cd zlib-1.2.11 && \
+RUN curl -O -L https://github.com/madler/zlib/archive/v1.2.12.tar.gz && \
+ tar xvfz v1.2.12.tar.gz && \
+ cd zlib-1.2.12 && \
CFLAGS="-fPIC -O3" ./configure && \
make && make install && \
- rm -rf /v1.2.11.tar.gz /zlib-1.2.11
+ rm -rf /v1.2.12.tar.gz /zlib-1.2.12
# Zstandard
RUN curl -O -L
https://github.com/facebook/zstd/releases/download/v1.3.7/zstd-1.3.7.tar.gz && \
