From 2c1b39ceb1aeeefd2d62459a22882ccf7d5978e7 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 00:23:26 +0000 Subject: [PATCH 1/8] curl 8.6.0 --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 24be550..8e8e394 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -232,7 +232,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..aa056f2 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -233,7 +233,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..0ba25ba 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -233,7 +233,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..3d1b043 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -233,7 +233,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; \ From 53b79e9f5663aadd906a256f3e4020cf3e58a5ad Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:22:37 +0000 Subject: [PATCH 2/8] Add libpsl --- php-80/Dockerfile | 22 ++++++++++++++++++++++ php-81/Dockerfile | 22 ++++++++++++++++++++++ php-82/Dockerfile | 22 ++++++++++++++++++++++ php-83/Dockerfile | 22 ++++++++++++++++++++++ 4 files changed, 88 insertions(+) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 8e8e394..ec55d6b 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -222,6 +222,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN ./autogen.sh && autoconf +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 diff --git a/php-81/Dockerfile b/php-81/Dockerfile index aa056f2..0ef804d 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -223,6 +223,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN ./autogen.sh && autoconf +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 diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 0ba25ba..e147805 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -223,6 +223,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN ./autogen.sh && autoconf +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 diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 3d1b043..92ce50a 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -223,6 +223,28 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 +WORKDIR ${LIBPSL_BUILD_DIR}/ +RUN ./autogen.sh && autoconf +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 From b3266fb288eb2fecc291c6325020eb4ad977665a Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:33:17 +0000 Subject: [PATCH 3/8] Fixes --- php-80/Dockerfile | 1 + php-81/Dockerfile | 1 + php-82/Dockerfile | 1 + php-83/Dockerfile | 1 + 4 files changed, 4 insertions(+) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index ec55d6b..adef937 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -228,6 +228,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 0ef804d..f0ba4c5 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -229,6 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index e147805..015ece7 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -229,6 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 92ce50a..94e8984 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -229,6 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ From 289e20a5410e13b904db5a147ce8bccadce1da72 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:38:55 +0000 Subject: [PATCH 4/8] Fixes --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index adef937..4027781 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -228,7 +228,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf +RUN yum install -y autoconf autoconf-archive ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index f0ba4c5..63fda00 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -229,7 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf +RUN yum install -y autoconf autoconf-archive ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 015ece7..f92d129 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -229,7 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf +RUN yum install -y autoconf autoconf-archive ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 94e8984..2f31fd1 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -229,7 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf +RUN yum install -y autoconf autoconf-archive ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ From 2b44e3e5d235feba6ff6a817f4da14cfb613b7e7 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:45:09 +0000 Subject: [PATCH 5/8] Revert "Fixes" This reverts commit 289e20a5410e13b904db5a147ce8bccadce1da72. --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 4027781..adef937 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -228,7 +228,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf autoconf-archive +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 63fda00..f0ba4c5 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -229,7 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf autoconf-archive +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index f92d129..015ece7 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -229,7 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf autoconf-archive +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 2f31fd1..94e8984 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -229,7 +229,7 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf autoconf-archive +RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ From 2b5db6ad1d801daaf6e1cdd857380173559a10d6 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:45:12 +0000 Subject: [PATCH 6/8] Revert "Fixes" This reverts commit b3266fb288eb2fecc291c6325020eb4ad977665a. --- php-80/Dockerfile | 1 - php-81/Dockerfile | 1 - php-82/Dockerfile | 1 - php-83/Dockerfile | 1 - 4 files changed, 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index adef937..ec55d6b 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -228,7 +228,6 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index f0ba4c5..0ef804d 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -229,7 +229,6 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 015ece7..e147805 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -229,7 +229,6 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 94e8984..92ce50a 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -229,7 +229,6 @@ RUN make install # https://github.com/rockdaboot/libpsl/releases # Needed by: # - curl -RUN yum install -y autoconf ENV VERSION_LIBPSL=0.21.5 ENV LIBPSL_BUILD_DIR=${BUILD_DIR}/libpsl RUN set -xe; \ From 149ab7957aedf6022bc3e7531f6bd7e3177101e3 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:46:10 +0000 Subject: [PATCH 7/8] Derp --- php-80/Dockerfile | 1 - php-81/Dockerfile | 1 - php-82/Dockerfile | 1 - php-83/Dockerfile | 1 - 4 files changed, 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index ec55d6b..2e4dece 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -235,7 +235,6 @@ RUN set -xe; \ curl -Ls https://github.com/rockdaboot/libpsl/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 WORKDIR ${LIBPSL_BUILD_DIR}/ -RUN ./autogen.sh && autoconf RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 0ef804d..32ba0c2 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -236,7 +236,6 @@ RUN set -xe; \ curl -Ls https://github.com/rockdaboot/libpsl/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 WORKDIR ${LIBPSL_BUILD_DIR}/ -RUN ./autogen.sh && autoconf RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index e147805..161a862 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -236,7 +236,6 @@ RUN set -xe; \ curl -Ls https://github.com/rockdaboot/libpsl/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 WORKDIR ${LIBPSL_BUILD_DIR}/ -RUN ./autogen.sh && autoconf RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 92ce50a..369e747 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -236,7 +236,6 @@ RUN set -xe; \ curl -Ls https://github.com/rockdaboot/libpsl/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ | tar xzC ${LIBPSL_BUILD_DIR} --strip-components=1 WORKDIR ${LIBPSL_BUILD_DIR}/ -RUN ./autogen.sh && autoconf RUN CFLAGS="" \ CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \ LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \ From 896d41fcb4910ea4eae61e0d3bd5bf4b8969bbff Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Wed, 31 Jan 2024 11:55:23 +0000 Subject: [PATCH 8/8] Fixed download URL --- php-80/Dockerfile | 2 +- php-81/Dockerfile | 2 +- php-82/Dockerfile | 2 +- php-83/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php-80/Dockerfile b/php-80/Dockerfile index 2e4dece..6ae2fce 100644 --- a/php-80/Dockerfile +++ b/php-80/Dockerfile @@ -232,7 +232,7 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + 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="" \ diff --git a/php-81/Dockerfile b/php-81/Dockerfile index 32ba0c2..d1e3528 100644 --- a/php-81/Dockerfile +++ b/php-81/Dockerfile @@ -233,7 +233,7 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + 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="" \ diff --git a/php-82/Dockerfile b/php-82/Dockerfile index 161a862..9c648fa 100644 --- a/php-82/Dockerfile +++ b/php-82/Dockerfile @@ -233,7 +233,7 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + 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="" \ diff --git a/php-83/Dockerfile b/php-83/Dockerfile index 369e747..a041f72 100644 --- a/php-83/Dockerfile +++ b/php-83/Dockerfile @@ -233,7 +233,7 @@ 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/archive/refs/tags/${VERSION_LIBPSL}.tar.gz \ + 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="" \