VladPolskiy/php-docker-library
1
0
Fork 0
mirror of https://github.com/docker-library/php.git synced 2025-08-03 01:12:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add patches for Alpine/8.1 builds

Browse Source 
Co-authored-by: yosifkit <joseph.ferguson@docker.com>
This commit is contained in:
Jesper Noordsij
2024-12-11 10:13:33 +01:00
parent aa678aea64
commit 45cfafc333
7 changed files with 93 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
8.1/alpine3.20/cli/Dockerfile generated
View File

@ -100,6 +100,8 @@ RUN set -eux; \
linux-headers \ linux-headers \
oniguruma-dev \ oniguruma-dev \
openssl-dev \ openssl-dev \
patch \
patchutils \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
; \ ; \
@ -117,6 +119,17 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \ ./configure \
--build="$gnuArch" \ --build="$gnuArch" \

13
8.1/alpine3.20/fpm/Dockerfile generated
View File

@ -100,6 +100,8 @@ RUN set -eux; \
linux-headers \ linux-headers \
oniguruma-dev \ oniguruma-dev \
openssl-dev \ openssl-dev \
patch \
patchutils \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
; \ ; \
@ -117,6 +119,17 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \ ./configure \
--build="$gnuArch" \ --build="$gnuArch" \

13
8.1/alpine3.20/zts/Dockerfile generated
View File

@ -100,6 +100,8 @@ RUN set -eux; \
linux-headers \ linux-headers \
oniguruma-dev \ oniguruma-dev \
openssl-dev \ openssl-dev \
patch \
patchutils \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
; \ ; \
@ -117,6 +119,17 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \ ./configure \
--build="$gnuArch" \ --build="$gnuArch" \

13
8.1/alpine3.21/cli/Dockerfile generated
View File

@ -100,6 +100,8 @@ RUN set -eux; \
linux-headers \ linux-headers \
oniguruma-dev \ oniguruma-dev \
openssl-dev \ openssl-dev \
patch \
patchutils \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
; \ ; \
@ -117,6 +119,17 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \ ./configure \
--build="$gnuArch" \ --build="$gnuArch" \

13
8.1/alpine3.21/fpm/Dockerfile generated
View File

@ -100,6 +100,8 @@ RUN set -eux; \
linux-headers \ linux-headers \
oniguruma-dev \ oniguruma-dev \
openssl-dev \ openssl-dev \
patch \
patchutils \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
; \ ; \
@ -117,6 +119,17 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \ ./configure \
--build="$gnuArch" \ --build="$gnuArch" \

13
8.1/alpine3.21/zts/Dockerfile generated
View File

@ -100,6 +100,8 @@ RUN set -eux; \
linux-headers \ linux-headers \
oniguruma-dev \ oniguruma-dev \
openssl-dev \ openssl-dev \
patch \
patchutils \
readline-dev \ readline-dev \
sqlite-dev \ sqlite-dev \
; \ ; \
@ -117,6 +119,17 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
./configure \ ./configure \
--build="$gnuArch" \ --build="$gnuArch" \

15
Dockerfile-linux.template
View File

@ -261,6 +261,8 @@ RUN set -eux; \
"libsodium-dev", "libsodium-dev",
"libxml2-dev", "libxml2-dev",
"openssl-dev", "openssl-dev",
# https://github.com/docker-library/php/pull/1552
if env.version | rtrimstr("-rc") == "8.1" then "patch", "patchutils" else empty end,
"readline-dev", "readline-dev",
"sqlite-dev", "sqlite-dev",
# https://github.com/docker-library/php/issues/888 # https://github.com/docker-library/php/issues/888
@ -304,6 +306,19 @@ RUN set -eux; \
; \ ; \
docker-php-source extract; \ docker-php-source extract; \
cd /usr/src/php; \ cd /usr/src/php; \
{{ if is_alpine and (env.version | rtrimstr("-rc") == "8.1") then ( -}}
# Apply patches; see https://github.com/docker-library/php/pull/1552
# https://github.com/php/php-src/issues/11678
curl -fL 'https://github.com/php/php-src/commit/577b8ae4226368e66fee7a9b5c58f9e2428372fc.patch?full_index=1' -o 11678.patch; \
echo '6edc20c3bb3e7cc13515abce7f2fffa8ebea6cf7469abfbc78fcdc120350b239 *11678.patch' | sha256sum -c -; \
patch -p1 < 11678.patch; \
rm 11678.patch; \
# https://github.com/php/php-src/issues/14834
curl -fL 'https://github.com/php/php-src/commit/67259e451d5d58b4842776c5696a66d74e157609.patch?full_index=1' -o 14834.patch; \
echo 'ed10a1b254091ad676ed204e55628ecbd6c8962004d6185a1821cedecd526c0f *14834.patch' | sha256sum -c -; \
filterdiff -x '*/NEWS' 14834.patch | patch -p1; \
rm 14834.patch; \
{{ ) else "" end -}}
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
{{ if is_alpine then "" else ( -}} {{ if is_alpine then "" else ( -}}
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \