diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 24be550..6ae2fce 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -222,6 +222,27 @@ RUN CFLAGS="" \ RUN make install +############################################################################### +# LIBPSL +# This adds support for the public suffix list in curl. +# https://github.com/rockdaboot/libpsl/releases +# Needed by: +# - curl +ENV VERSION_LIBPSL=0.21.5 +ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl +RUN set -xe; \ + mkdir -p ${LIBPSL_BUILD_DIR}; \ + curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN CFLAGS="" \ + CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ + LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ + ./configure \ + --prefix=${INSTALL_DIR} +RUN make -j $(nproc) && make install + + ############################################################################### # CURL # # https://github.com/curl/curl/releases @@ -232,7 +253,7 @@ RUN make install # # - libnghttp2 # # Needed by: # # - php -ENV VERSION_CURL=8.5.0 +ENV VERSION_CURL=8.6.0 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl RUN set -xe; \ mkdir -p ${CURL_BUILD_DIR}/bin; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index c87055a..d1e3528 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -223,6 +223,27 @@ RUN CFLAGS="" \ RUN make install +############################################################################### +# LIBPSL +# This adds support for the public suffix list in curl. +# https://github.com/rockdaboot/libpsl/releases +# Needed by: +# - curl +ENV VERSION_LIBPSL=0.21.5 +ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl +RUN set -xe; \ + mkdir -p ${LIBPSL_BUILD_DIR}; \ + curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN CFLAGS="" \ + CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ + LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ + ./configure \ + --prefix=${INSTALL_DIR} +RUN make -j $(nproc) && make install + + ############################################################################### # CURL # # https://github.com/curl/curl/releases @@ -233,7 +254,7 @@ RUN make install # # - libnghttp2 # # Needed by: # # - php -ENV VERSION_CURL=8.5.0 +ENV VERSION_CURL=8.6.0 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl RUN set -xe; \ mkdir -p ${CURL_BUILD_DIR}/bin; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 0d068f9..9c648fa 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -223,6 +223,27 @@ RUN CFLAGS="" \ RUN make install +############################################################################### +# LIBPSL +# This adds support for the public suffix list in curl. +# https://github.com/rockdaboot/libpsl/releases +# Needed by: +# - curl +ENV VERSION_LIBPSL=0.21.5 +ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl +RUN set -xe; \ + mkdir -p ${LIBPSL_BUILD_DIR}; \ + curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN CFLAGS="" \ + CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ + LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ + ./configure \ + --prefix=${INSTALL_DIR} +RUN make -j $(nproc) && make install + + ############################################################################### # CURL # # https://github.com/curl/curl/releases @@ -233,7 +254,7 @@ RUN make install # # - libnghttp2 # # Needed by: # # - php -ENV VERSION_CURL=8.5.0 +ENV VERSION_CURL=8.6.0 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl RUN set -xe; \ mkdir -p ${CURL_BUILD_DIR}/bin; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index fb55d3b..a041f72 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -223,6 +223,27 @@ RUN CFLAGS="" \ RUN make install +############################################################################### +# LIBPSL +# This adds support for the public suffix list in curl. +# https://github.com/rockdaboot/libpsl/releases +# Needed by: +# - curl +ENV VERSION_LIBPSL=0.21.5 +ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl +RUN set -xe; \ + mkdir -p ${LIBPSL_BUILD_DIR}; \ + curl -Ls https://github.com/rockdaboot/libpsl/releases/download/${VERSION_LIBPSL}/libpsl-${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN CFLAGS="" \ + CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ + LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ + ./configure \ + --prefix=${INSTALL_DIR} +RUN make -j $(nproc) && make install + + ############################################################################### # CURL # # https://github.com/curl/curl/releases @@ -233,7 +254,7 @@ RUN make install # # - libnghttp2 # # Needed by: # # - php -ENV VERSION_CURL=8.5.0 +ENV VERSION_CURL=8.6.0 ENV CURL_BUILD_DIR=${BUILD_DIR}/curl RUN set -xe; \ mkdir -p ${CURL_BUILD_DIR}/bin; \