Skip to content

Commit

Permalink
[CI] Upgrade zlib version to 1.2.12 (apache#14964)
Browse files Browse the repository at this point in the history
Co-authored-by: Zike Yang <[email protected]>
(cherry picked from commit 8b2b988)
(cherry picked from commit c8b7eba)
  • Loading branch information
yaalsn authored and nicoloboschi committed Apr 5, 2022
1 parent 3660279 commit fc6ee9c
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
8 changes: 4 additions & 4 deletions pulsar-client-cpp/docker/alpine/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 4 additions & 4 deletions pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 4 additions & 4 deletions pulsar-client-cpp/docker/manylinux1/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 4 additions & 4 deletions pulsar-client-cpp/docker/manylinux2014/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 4 additions & 4 deletions pulsar-client-cpp/pkg/deb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions pulsar-client-cpp/pkg/licenses/LICENSE-zlib.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions pulsar-client-cpp/pkg/rpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down

0 comments on commit fc6ee9c

Please sign in to comment.