VladPolskiy/php-docker-library
1
0
Fork 0
mirror of https://github.com/docker-library/php.git synced 2025-07-28 23:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply review nits

Browse Source
This commit is contained in:
Tianon Gravi
2024-07-08 14:36:25 -07:00
parent a1dce0f830
commit 6de7c598d3
15 changed files with 60 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
8.4-rc/alpine3.19/cli/Dockerfile generated
View File

@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -89,11 +87,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apk del --no-network .patch-deps; \
apk del --no-network .fetch-deps

11
8.4-rc/alpine3.19/fpm/Dockerfile generated
View File

@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -89,11 +87,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apk del --no-network .patch-deps; \
apk del --no-network .fetch-deps

11
8.4-rc/alpine3.19/zts/Dockerfile generated
View File

@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -89,11 +87,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apk del --no-network .patch-deps; \
apk del --no-network .fetch-deps

11
8.4-rc/alpine3.20/cli/Dockerfile generated
View File

@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -89,11 +87,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apk del --no-network .patch-deps; \
apk del --no-network .fetch-deps

11
8.4-rc/alpine3.20/fpm/Dockerfile generated
View File

@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -89,11 +87,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apk del --no-network .patch-deps; \
apk del --no-network .fetch-deps

11
8.4-rc/alpine3.20/zts/Dockerfile generated
View File

@ -59,8 +59,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -89,11 +87,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apk del --no-network .patch-deps; \
apk del --no-network .fetch-deps

11
8.4-rc/bookworm/apache/Dockerfile generated
View File

@ -123,8 +123,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -156,11 +154,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bookworm/cli/Dockerfile generated
View File

@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -96,11 +94,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bookworm/fpm/Dockerfile generated
View File

@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -96,11 +94,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bookworm/zts/Dockerfile generated
View File

@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -96,11 +94,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bullseye/apache/Dockerfile generated
View File

@ -121,8 +121,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -154,11 +152,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bullseye/cli/Dockerfile generated
View File

@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -96,11 +94,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bullseye/fpm/Dockerfile generated
View File

@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -96,11 +94,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

11
8.4-rc/bullseye/zts/Dockerfile generated
View File

@ -63,8 +63,6 @@ ENV GPG_KEYS AFD8691FDAEDF03BDF6E460563F15A9B715376CA 9D7F99A0CB8F05C8A6958D6256
ENV PHP_VERSION 8.4.0alpha1
ENV PHP_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz" PHP_ASC_URL="https://downloads.php.net/~saki/php-8.4.0alpha1.tar.xz.asc"
ENV PHP_SHA256="65903a7add51350540b567f8cd2d964ac11366bf33e1b287489765feac45278e"
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
RUN set -eux; \
\
@ -96,11 +94,10 @@ RUN set -eux; \
fi; \
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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; \
\
apt-mark auto '.*' > /dev/null; \
apt-mark manual $savedAptMark > /dev/null; \

13
Dockerfile-linux.template
View File

@ -198,10 +198,6 @@ ENV GPG_KEYS {{
ENV PHP_VERSION {{ .version }}
ENV PHP_URL="{{ .url }}" PHP_ASC_URL="{{ .ascUrl // "" }}"
ENV PHP_SHA256="{{ .sha256 // "" }}"
{{ if .version == "8.4.0alpha1" then ( -}}
ENV PHP_PDO_PATCH_URL="https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch"
ENV PHP_PDO_PATCH_SHA256="d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e"
{{ ) else "" end -}}
RUN set -eux; \
\
@ -244,11 +240,10 @@ RUN set -eux; \
{{ if .version == "8.4.0alpha1" then ( -}}
\
# Add patch; see https://github.com/docker-library/php/pull/1526
curl -fsSL -o php-pdo.patch https://patch-diff.githubusercontent.com/raw/php/php-src/pull/14797.patch; \
echo "d9f33beda1ffffc66299377a0946b1fe2916382e320084568ae6ee2a6d1fb19e php-pdo.patch" | sha256sum -c -; \
TEMPFILE=$(mktemp); \
filterdiff -p1 -x 'NEWS' < php-pdo.patch >$TEMPFILE; \
mv $TEMPFILE php-pdo.patch; \
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 ( -}}