Skip to content

Commit eacb8b6

Browse files
mnapolimnapoli
authored
Merge pull request #83 from GrahamCampbell/curl-upgrade
2 parents 6fab390 + eac15c6 commit eacb8b6

File tree

3 files changed

+109
-98
lines changed

3 files changed

+109
-98
lines changed

‎php-80/Dockerfile‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,39 @@ RUN make -j1 install_sw install_ssldirs
105105
RUN mkdir -p ${INSTALL_DIR}/bref/ssl && curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
106106

107107

108+
###############################################################################
109+
# LIBXML2
110+
# https://github.com/GNOME/libxml2/releases
111+
# Uses:
112+
# - zlib
113+
# Needed by:
114+
# - php
115+
# - libnghttp2
116+
ENV VERSION_XML2=2.11.2
117+
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2
118+
RUN set -xe; \
119+
mkdir -p ${XML2_BUILD_DIR}; \
120+
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
121+
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
122+
WORKDIR ${XML2_BUILD_DIR}/
123+
RUN CFLAGS="" \
124+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
125+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
126+
./configure \
127+
--prefix=${INSTALL_DIR} \
128+
--with-sysroot=${INSTALL_DIR} \
129+
--enable-shared \
130+
--disable-static \
131+
--with-html \
132+
--with-history \
133+
--enable-ipv6=no \
134+
--with-icu \
135+
--with-zlib \
136+
--without-python
137+
RUN make install \
138+
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config
139+
140+
108141
###############################################################################
109142
# LIBSSH2
110143
# https://github.com/libssh2/libssh2/releases
@@ -143,6 +176,7 @@ RUN cmake --build . --target install
143176
# Needs:
144177
# - zlib
145178
# - OpenSSL
179+
# - libxml2
146180
# Needed by:
147181
# - curl
148182
ENV VERSION_NGHTTP2=1.53.0
@@ -168,6 +202,7 @@ RUN make install
168202
# # - zlib
169203
# # - OpenSSL
170204
# # - libssh2
205+
# # - libnghttp2
171206
# # Needed by:
172207
# # - php
173208
ENV VERSION_CURL=7.85.0
@@ -205,38 +240,6 @@ RUN ./buildconf \
205240
RUN make install
206241

207242

208-
###############################################################################
209-
# LIBXML2
210-
# https://github.com/GNOME/libxml2/releases
211-
# Uses:
212-
# - zlib
213-
# Needed by:
214-
# - php
215-
ENV VERSION_XML2=2.11.2
216-
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2
217-
RUN set -xe; \
218-
mkdir -p ${XML2_BUILD_DIR}; \
219-
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
220-
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
221-
WORKDIR ${XML2_BUILD_DIR}/
222-
RUN CFLAGS="" \
223-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
224-
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
225-
./configure \
226-
--prefix=${INSTALL_DIR} \
227-
--with-sysroot=${INSTALL_DIR} \
228-
--enable-shared \
229-
--disable-static \
230-
--with-html \
231-
--with-history \
232-
--enable-ipv6=no \
233-
--with-icu \
234-
--with-zlib \
235-
--without-python
236-
RUN make install \
237-
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config
238-
239-
240243
###############################################################################
241244
# LIBZIP
242245
# https://github.com/nih-at/libzip/releases

‎php-81/Dockerfile‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ RUN CFLAGS="" \
9494
--prefix=${INSTALL_DIR} \
9595
--openssldir=${INSTALL_DIR}/bref/ssl \
9696
--release \
97+
enable-tls1_3 \
9798
no-tests \
9899
shared \
99100
zlib
@@ -106,6 +107,39 @@ RUN make -j1 install_sw install_ssldirs
106107
RUN mkdir -p ${INSTALL_DIR}/bref/ssl && curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
107108

108109

110+
###############################################################################
111+
# LIBXML2
112+
# https://github.com/GNOME/libxml2/releases
113+
# Uses:
114+
# - zlib
115+
# Needed by:
116+
# - php
117+
# - libnghttp2
118+
ENV VERSION_XML2=2.11.2
119+
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2
120+
RUN set -xe; \
121+
mkdir -p ${XML2_BUILD_DIR}; \
122+
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
123+
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
124+
WORKDIR ${XML2_BUILD_DIR}/
125+
RUN CFLAGS="" \
126+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
127+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
128+
./configure \
129+
--prefix=${INSTALL_DIR} \
130+
--with-sysroot=${INSTALL_DIR} \
131+
--enable-shared \
132+
--disable-static \
133+
--with-html \
134+
--with-history \
135+
--enable-ipv6=no \
136+
--with-icu \
137+
--with-zlib \
138+
--without-python
139+
RUN make install \
140+
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config
141+
142+
109143
###############################################################################
110144
# LIBSSH2
111145
# https://github.com/libssh2/libssh2/releases
@@ -144,6 +178,7 @@ RUN cmake --build . --target install
144178
# Needs:
145179
# - zlib
146180
# - OpenSSL
181+
# - libxml2
147182
# Needed by:
148183
# - curl
149184
ENV VERSION_NGHTTP2=1.53.0
@@ -169,9 +204,10 @@ RUN make install
169204
# # - zlib
170205
# # - OpenSSL
171206
# # - libssh2
207+
# # - libnghttp2
172208
# # Needed by:
173209
# # - php
174-
ENV VERSION_CURL=7.85.0
210+
ENV VERSION_CURL=8.1.0
175211
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
176212
RUN set -xe; \
177213
mkdir -p ${CURL_BUILD_DIR}/bin; \
@@ -206,38 +242,6 @@ RUN ./buildconf \
206242
RUN make install
207243

208244

209-
###############################################################################
210-
# LIBXML2
211-
# https://github.com/GNOME/libxml2/releases
212-
# Uses:
213-
# - zlib
214-
# Needed by:
215-
# - php
216-
ENV VERSION_XML2=2.11.2
217-
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2
218-
RUN set -xe; \
219-
mkdir -p ${XML2_BUILD_DIR}; \
220-
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
221-
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
222-
WORKDIR ${XML2_BUILD_DIR}/
223-
RUN CFLAGS="" \
224-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
225-
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
226-
./configure \
227-
--prefix=${INSTALL_DIR} \
228-
--with-sysroot=${INSTALL_DIR} \
229-
--enable-shared \
230-
--disable-static \
231-
--with-html \
232-
--with-history \
233-
--enable-ipv6=no \
234-
--with-icu \
235-
--with-zlib \
236-
--without-python
237-
RUN make install \
238-
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config
239-
240-
241245
###############################################################################
242246
# LIBZIP
243247
# https://github.com/nih-at/libzip/releases

‎php-82/Dockerfile‎

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ RUN CFLAGS="" \
9494
--prefix=${INSTALL_DIR} \
9595
--openssldir=${INSTALL_DIR}/bref/ssl \
9696
--release \
97+
enable-tls1_3 \
9798
no-tests \
9899
shared \
99100
zlib
@@ -106,6 +107,39 @@ RUN make -j1 install_sw install_ssldirs
106107
RUN mkdir -p ${INSTALL_DIR}/bref/ssl && curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
107108

108109

110+
###############################################################################
111+
# LIBXML2
112+
# https://github.com/GNOME/libxml2/releases
113+
# Uses:
114+
# - zlib
115+
# Needed by:
116+
# - php
117+
# - libnghttp2
118+
ENV VERSION_XML2=2.11.2
119+
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2
120+
RUN set -xe; \
121+
mkdir -p ${XML2_BUILD_DIR}; \
122+
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
123+
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
124+
WORKDIR ${XML2_BUILD_DIR}/
125+
RUN CFLAGS="" \
126+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
127+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
128+
./configure \
129+
--prefix=${INSTALL_DIR} \
130+
--with-sysroot=${INSTALL_DIR} \
131+
--enable-shared \
132+
--disable-static \
133+
--with-html \
134+
--with-history \
135+
--enable-ipv6=no \
136+
--with-icu \
137+
--with-zlib \
138+
--without-python
139+
RUN make install \
140+
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config
141+
142+
109143
###############################################################################
110144
# LIBSSH2
111145
# https://github.com/libssh2/libssh2/releases
@@ -144,6 +178,7 @@ RUN cmake --build . --target install
144178
# Needs:
145179
# - zlib
146180
# - OpenSSL
181+
# - libxml2
147182
# Needed by:
148183
# - curl
149184
ENV VERSION_NGHTTP2=1.53.0
@@ -169,9 +204,10 @@ RUN make install
169204
# # - zlib
170205
# # - OpenSSL
171206
# # - libssh2
207+
# # - libnghttp2
172208
# # Needed by:
173209
# # - php
174-
ENV VERSION_CURL=7.85.0
210+
ENV VERSION_CURL=8.1.0
175211
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
176212
RUN set -xe; \
177213
mkdir -p ${CURL_BUILD_DIR}/bin; \
@@ -206,38 +242,6 @@ RUN ./buildconf \
206242
RUN make install
207243

208244

209-
###############################################################################
210-
# LIBXML2
211-
# https://github.com/GNOME/libxml2/releases
212-
# Uses:
213-
# - zlib
214-
# Needed by:
215-
# - php
216-
ENV VERSION_XML2=2.11.2
217-
ENV XML2_BUILD_DIR=${BUILD_DIR}/xml2
218-
RUN set -xe; \
219-
mkdir -p ${XML2_BUILD_DIR}; \
220-
curl -Ls https://download.gnome.org/sources/libxml2/${VERSION_XML2%.*}/libxml2-${VERSION_XML2}.tar.xz \
221-
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
222-
WORKDIR ${XML2_BUILD_DIR}/
223-
RUN CFLAGS="" \
224-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
225-
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
226-
./configure \
227-
--prefix=${INSTALL_DIR} \
228-
--with-sysroot=${INSTALL_DIR} \
229-
--enable-shared \
230-
--disable-static \
231-
--with-html \
232-
--with-history \
233-
--enable-ipv6=no \
234-
--with-icu \
235-
--with-zlib \
236-
--without-python
237-
RUN make install \
238-
&& cp xml2-config ${INSTALL_DIR}/bin/xml2-config
239-
240-
241245
###############################################################################
242246
# LIBZIP
243247
# https://github.com/nih-at/libzip/releases

0 commit comments

Comments
 (0)