Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove patch workaround for 8.4.0alpha1 #1530

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Remove patch workaround for 8.4.0alpha1 #1530

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions Dockerfile-linux.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
\
Expand All @@ -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; \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)"; \
Expand Down
Loading