Skip to content

Commit 0e16c91

Browse files
mnapolimnapoli
authored
Merge pull request #110 from GrahamCampbell/use-newer-zlib
Use newer zlib than shipped in AL2
2 parents d202149 + 4b92c1f commit 0e16c91

File tree

4 files changed

+144
-0
lines changed

4 files changed

+144
-0
lines changed

‎php-80/Dockerfile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,42 @@ RUN mkdir -p ${BUILD_DIR} \
6969
${INSTALL_DIR}/share
7070

7171

72+
###############################################################################
73+
# ZLIB Build
74+
# https://github.com/madler/zlib/releases
75+
# Needed for:
76+
# - openssl
77+
# - curl
78+
# - php
79+
# Used By:
80+
# - xml2
81+
ENV VERSION_ZLIB=1.3
82+
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
83+
84+
RUN set -xe; \
85+
mkdir -p ${ZLIB_BUILD_DIR}; \
86+
# Download and upack the source code
87+
curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
88+
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
89+
90+
# Move into the unpackaged code directory
91+
WORKDIR ${ZLIB_BUILD_DIR}/
92+
93+
# Configure the build
94+
RUN set -xe; \
95+
make distclean \
96+
&& CFLAGS="" \
97+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
98+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
99+
./configure \
100+
--prefix=${INSTALL_DIR} \
101+
--64
102+
103+
RUN set -xe; \
104+
make install \
105+
&& rm ${INSTALL_DIR}/lib/libz.a
106+
107+
72108
###############################################################################
73109
# OPENSSL
74110
# https://github.com/openssl/openssl/releases

‎php-81/Dockerfile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,42 @@ RUN mkdir -p ${BUILD_DIR} \
6969
${INSTALL_DIR}/share
7070

7171

72+
###############################################################################
73+
# ZLIB Build
74+
# https://github.com/madler/zlib/releases
75+
# Needed for:
76+
# - openssl
77+
# - curl
78+
# - php
79+
# Used By:
80+
# - xml2
81+
ENV VERSION_ZLIB=1.3
82+
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
83+
84+
RUN set -xe; \
85+
mkdir -p ${ZLIB_BUILD_DIR}; \
86+
# Download and upack the source code
87+
curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
88+
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
89+
90+
# Move into the unpackaged code directory
91+
WORKDIR ${ZLIB_BUILD_DIR}/
92+
93+
# Configure the build
94+
RUN set -xe; \
95+
make distclean \
96+
&& CFLAGS="" \
97+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
98+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
99+
./configure \
100+
--prefix=${INSTALL_DIR} \
101+
--64
102+
103+
RUN set -xe; \
104+
make install \
105+
&& rm ${INSTALL_DIR}/lib/libz.a
106+
107+
72108
###############################################################################
73109
# OPENSSL
74110
# https://github.com/openssl/openssl/releases

‎php-82/Dockerfile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,42 @@ RUN mkdir -p ${BUILD_DIR} \
6969
${INSTALL_DIR}/share
7070

7171

72+
###############################################################################
73+
# ZLIB Build
74+
# https://github.com/madler/zlib/releases
75+
# Needed for:
76+
# - openssl
77+
# - curl
78+
# - php
79+
# Used By:
80+
# - xml2
81+
ENV VERSION_ZLIB=1.3
82+
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
83+
84+
RUN set -xe; \
85+
mkdir -p ${ZLIB_BUILD_DIR}; \
86+
# Download and upack the source code
87+
curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
88+
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
89+
90+
# Move into the unpackaged code directory
91+
WORKDIR ${ZLIB_BUILD_DIR}/
92+
93+
# Configure the build
94+
RUN set -xe; \
95+
make distclean \
96+
&& CFLAGS="" \
97+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
98+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
99+
./configure \
100+
--prefix=${INSTALL_DIR} \
101+
--64
102+
103+
RUN set -xe; \
104+
make install \
105+
&& rm ${INSTALL_DIR}/lib/libz.a
106+
107+
72108
###############################################################################
73109
# OPENSSL
74110
# https://github.com/openssl/openssl/releases

‎php-83/Dockerfile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,42 @@ RUN mkdir -p ${BUILD_DIR} \
7070
${INSTALL_DIR}/share
7171

7272

73+
###############################################################################
74+
# ZLIB Build
75+
# https://github.com/madler/zlib/releases
76+
# Needed for:
77+
# - openssl
78+
# - curl
79+
# - php
80+
# Used By:
81+
# - xml2
82+
ENV VERSION_ZLIB=1.3
83+
ENV ZLIB_BUILD_DIR=${BUILD_DIR}/xml2
84+
85+
RUN set -xe; \
86+
mkdir -p ${ZLIB_BUILD_DIR}; \
87+
# Download and upack the source code
88+
curl -Ls http://zlib.net/zlib-${VERSION_ZLIB}.tar.xz \
89+
| tar xJC ${ZLIB_BUILD_DIR} --strip-components=1
90+
91+
# Move into the unpackaged code directory
92+
WORKDIR ${ZLIB_BUILD_DIR}/
93+
94+
# Configure the build
95+
RUN set -xe; \
96+
make distclean \
97+
&& CFLAGS="" \
98+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
99+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
100+
./configure \
101+
--prefix=${INSTALL_DIR} \
102+
--64
103+
104+
RUN set -xe; \
105+
make install \
106+
&& rm ${INSTALL_DIR}/lib/libz.a
107+
108+
73109
###############################################################################
74110
# OPENSSL
75111
# https://github.com/openssl/openssl/releases

0 commit comments

Comments
 (0)