diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template index b079ec6fe..8d3b56b9f 100644 --- a/Dockerfile-linux.template +++ b/Dockerfile-linux.template @@ -203,18 +203,10 @@ RUN set -eux; \ \ {{ if is_alpine then ( -}} apk add --no-cache --virtual .fetch-deps gnupg; \ -{{ if .version == "8.4.0alpha1" then ( -}} - # Add patchutils; see https://github.com/docker-library/php/pull/1526 - apk add --no-cache --virtual .patch-deps patchutils; \ -{{ ) else "" end -}} {{ ) else ( -}} savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ apt-get install -y --no-install-recommends gnupg; \ -{{ if .version == "8.4.0alpha1" then ( -}} - # Add patchutils; see https://github.com/docker-library/php/pull/1526 - apt-get install -y --no-install-recommends patchutils; \ -{{ ) else "" end -}} rm -rf /var/lib/apt/lists/*; \ {{ ) end -}} \ @@ -237,19 +229,8 @@ RUN set -eux; \ gpgconf --kill all; \ rm -rf "$GNUPGHOME"; \ fi; \ -{{ if .version == "8.4.0alpha1" then ( -}} - \ - # Add patch; see https://github.com/docker-library/php/pull/1526 - curl -fsSL -o php-pdo.patch 'https://github.com/php/php-src/pull/14797.patch?full_index=1'; \ - echo '3a95762048a56ec0f59cb9ee18df49751ffb0bdd0e91e021b57f69ac7af62996 *php-pdo.patch' | sha256sum -c -; \ - filterdiff -p1 -x 'NEWS' < php-pdo.patch > php-pdo.patch.filtered; \ - mv php-pdo.patch.filtered php-pdo.patch; \ -{{ ) else "" end -}} \ {{ if is_alpine then ( -}} -{{ if .version == "8.4.0alpha1" then ( -}} - apk del --no-network .patch-deps; \ -{{ ) else "" end -}} apk del --no-network .fetch-deps {{ ) else ( -}} apt-mark auto '.*' > /dev/null; \ @@ -280,7 +261,6 @@ RUN set -eux; \ "libsodium-dev", "libxml2-dev", "openssl-dev", - if .version == "8.4.0alpha1" then "patch" else empty end, "readline-dev", "sqlite-dev", # https://github.com/docker-library/php/issues/888 @@ -324,11 +304,6 @@ RUN set -eux; \ ; \ docker-php-source extract; \ cd /usr/src/php; \ -{{ if .version == "8.4.0alpha1" then ( -}} -# Apply patch; see https://github.com/docker-library/php/pull/1526 - patch -p1 < ../php-pdo.patch; \ - ./buildconf -f; \ -{{ ) else "" end -}} gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ {{ if is_alpine then "" else ( -}} debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \