Skip to content

Commit 267db43

Browse files
mnapolimnapoli
authored
Merge pull request #157 from GrahamCampbell/curl-8-6-0
curl 8.6.0
2 parents e055311 + 896d41f commit 267db43

File tree

4 files changed

+88
-4
lines changed

4 files changed

+88
-4
lines changed

‎php-80/Dockerfile

+22-1
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,27 @@ RUN CFLAGS="" \
222222
RUN make install
223223

224224

225+
###############################################################################
226+
# LIBPSL
227+
# This adds support for the public suffix list in curl.
228+
# https://github.com/rockdaboot/libpsl/releases
229+
# Needed by:
230+
# - curl
231+
ENV VERSION_LIBPSL=0.21.5
232+
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
233+
RUN set -xe; \
234+
mkdir -p ${LIBPSL_BUILD_DIR}; \
235+
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
236+
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
237+
WORKDIR ${LIBPSL_BUILD_DIR}/
238+
RUN CFLAGS="" \
239+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
240+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
241+
./configure \
242+
--prefix=${INSTALL_DIR}
243+
RUN make -j $(nproc) && make install
244+
245+
225246
###############################################################################
226247
# CURL
227248
# # https://github.com/curl/curl/releases
@@ -232,7 +253,7 @@ RUN make install
232253
# # - libnghttp2
233254
# # Needed by:
234255
# # - php
235-
ENV VERSION_CURL=8.5.0
256+
ENV VERSION_CURL=8.6.0
236257
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
237258
RUN set -xe; \
238259
mkdir -p ${CURL_BUILD_DIR}/bin; \

‎php-81/Dockerfile

+22-1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,27 @@ RUN CFLAGS="" \
223223
RUN make install
224224

225225

226+
###############################################################################
227+
# LIBPSL
228+
# This adds support for the public suffix list in curl.
229+
# https://github.com/rockdaboot/libpsl/releases
230+
# Needed by:
231+
# - curl
232+
ENV VERSION_LIBPSL=0.21.5
233+
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
234+
RUN set -xe; \
235+
mkdir -p ${LIBPSL_BUILD_DIR}; \
236+
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
237+
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
238+
WORKDIR ${LIBPSL_BUILD_DIR}/
239+
RUN CFLAGS="" \
240+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
241+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
242+
./configure \
243+
--prefix=${INSTALL_DIR}
244+
RUN make -j $(nproc) && make install
245+
246+
226247
###############################################################################
227248
# CURL
228249
# # https://github.com/curl/curl/releases
@@ -233,7 +254,7 @@ RUN make install
233254
# # - libnghttp2
234255
# # Needed by:
235256
# # - php
236-
ENV VERSION_CURL=8.5.0
257+
ENV VERSION_CURL=8.6.0
237258
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
238259
RUN set -xe; \
239260
mkdir -p ${CURL_BUILD_DIR}/bin; \

‎php-82/Dockerfile

+22-1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,27 @@ RUN CFLAGS="" \
223223
RUN make install
224224

225225

226+
###############################################################################
227+
# LIBPSL
228+
# This adds support for the public suffix list in curl.
229+
# https://github.com/rockdaboot/libpsl/releases
230+
# Needed by:
231+
# - curl
232+
ENV VERSION_LIBPSL=0.21.5
233+
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
234+
RUN set -xe; \
235+
mkdir -p ${LIBPSL_BUILD_DIR}; \
236+
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
237+
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
238+
WORKDIR ${LIBPSL_BUILD_DIR}/
239+
RUN CFLAGS="" \
240+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
241+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
242+
./configure \
243+
--prefix=${INSTALL_DIR}
244+
RUN make -j $(nproc) && make install
245+
246+
226247
###############################################################################
227248
# CURL
228249
# # https://github.com/curl/curl/releases
@@ -233,7 +254,7 @@ RUN make install
233254
# # - libnghttp2
234255
# # Needed by:
235256
# # - php
236-
ENV VERSION_CURL=8.5.0
257+
ENV VERSION_CURL=8.6.0
237258
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
238259
RUN set -xe; \
239260
mkdir -p ${CURL_BUILD_DIR}/bin; \

‎php-83/Dockerfile

+22-1
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,27 @@ RUN CFLAGS="" \
223223
RUN make install
224224

225225

226+
###############################################################################
227+
# LIBPSL
228+
# This adds support for the public suffix list in curl.
229+
# https://github.com/rockdaboot/libpsl/releases
230+
# Needed by:
231+
# - curl
232+
ENV VERSION_LIBPSL=0.21.5
233+
ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl
234+
RUN set -xe; \
235+
mkdir -p ${LIBPSL_BUILD_DIR}; \
236+
curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \
237+
| tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1
238+
WORKDIR ${LIBPSL_BUILD_DIR}/
239+
RUN CFLAGS="" \
240+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
241+
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
242+
./configure \
243+
--prefix=${INSTALL_DIR}
244+
RUN make -j $(nproc) && make install
245+
246+
226247
###############################################################################
227248
# CURL
228249
# # https://github.com/curl/curl/releases
@@ -233,7 +254,7 @@ RUN make install
233254
# # - libnghttp2
234255
# # Needed by:
235256
# # - php
236-
ENV VERSION_CURL=8.5.0
257+
ENV VERSION_CURL=8.6.0
237258
ENV CURL_BUILD_DIR=${BUILD_DIR}/curl
238259
RUN set -xe; \
239260
mkdir -p ${CURL_BUILD_DIR}/bin; \

0 commit comments

Comments
 (0)