@@ -182,13 +182,6 @@ ENV GPG_KEYS {{
182182 "BFDD D286 4282 4F81 18EF 7790 9B67 A5C1 2229 118F", # carusogabriel
183183 "2C16 C765 DBE5 4A08 8130 F1BC 4B9B 5F60 0B55 F3B4" # carusogabriel
184184 ],
185-
186- "7.4": [
187- # https://wiki.php.net/todo/php74#release_managers
188- # https://www.php.net/gpg-keys.php#gpg-7.4
189- "4267 0A7F E4D0 441C 8E46 3234 9E4F DC07 4A4E F02D", # petk
190- "5A52 8807 81F7 5560 8BF8 15FC 910D EB46 F53E A312" # derick
191- ],
192185 }[env.version | rtrimstr("-rc")] // error("missing GPG keys for " + env.version)
193186 | map(gsub(" "; ""))
194187 | join(" ")
@@ -263,9 +256,9 @@ RUN set -eux; \
263256 "readline-dev",
264257 "sqlite-dev",
265258 # https://github.com/docker-library/php/issues/888
266- if (.version | version_id) >= ("7.4" | version_id) then " linux-headers" else empty end ,
259+ " linux-headers",
267260 # oniguruma is part of mbstring in php 7.4+
268- if (.version | version_id) >= ("7.4" | version_id) then " oniguruma-dev" else empty end
261+ " oniguruma-dev"
269262 else
270263 # debian packages
271264 if env.variant == "apache" then "apache2-dev" else empty end,
@@ -278,7 +271,7 @@ RUN set -eux; \
278271 "libxml2-dev",
279272 "zlib1g-dev",
280273 # oniguruma is part of mbstring in php 7.4+
281- if (.version | version_id) >= ("7.4" | version_id) then " libonig-dev" else empty end
274+ " libonig-dev"
282275 end ] | sort[] | (
283276-}}
284277 {{ . }} \
@@ -291,10 +284,6 @@ RUN set -eux; \
291284{{ if is_alpine then ( -}}
292285# make sure musl's iconv doesn't get used (https://www.php.net/manual/en/intro.iconv.php)
293286 rm -vf /usr/include/iconv.h; \
294- {{ if (.version | version_id) < ("8" | version_id) then ( -}}
295- # PHP < 8 doesn't know to look deeper for GNU libiconv: https://github.com/php/php-src/commit/b480e6841ecd5317faa136647a2b8253a4c2d0df
296- ln -sv /usr/include/gnu-libiconv/*.h /usr/include/; \
297- {{ ) else "" end -}}
298287 \
299288{{ ) else "" end -}}
300289 export \
@@ -355,11 +344,9 @@ RUN set -eux; \
355344 --disable-phpdbg \
356345{{ ) end -}}
357346 \
358- {{ if (.version | version_id) >= ("7.4" | version_id) then ( -}}
359347# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
360348 --with-pear \
361349 \
362- {{ ) else "" end -}}
363350# bundled pcre does not support JIT on s390x
364351# https://manpages.debian.org/bullseye/libpcre3-dev/pcrejit.3.en.html#AVAILABILITY_OF_JIT_SUPPORT
365352{{ if is_alpine then ( -}}
@@ -388,11 +375,7 @@ RUN set -eux; \
388375 --with-fpm-group=www-data \
389376{{ ) elif env.variant == "zts" then ( -}}
390377 \
391- {{ if (.version | version_id) >= ("8" | version_id) then ( -}}
392378 --enable-zts \
393- {{ ) else ( -}}
394- --enable-maintainer-zts \
395- {{ ) end -}}
396379# https://externals.io/message/118859
397380 --disable-zend-signals \
398381{{ ) else "" end -}}
@@ -454,17 +437,6 @@ COPY docker-php-ext-* docker-php-entrypoint /usr/local/bin/
454437# sodium was built as a shared module (so that it can be replaced later if so desired), so let's enable it too (https://github.com/docker-library/php/issues/598)
455438RUN docker-php-ext-enable sodium
456439
457- {{
458- # https://github.com/docker-library/php/issues/865
459- # https://bugs.php.net/bug.php?id=76324
460- # https://github.com/php/php-src/pull/3632
461- # https://github.com/php/php-src/commit/2d03197749696ac3f8effba6b7977b0d8729fef3
462- if (is_alpine | not) and (.version | version_id) < ("7.4" | version_id) then (
463- -}}
464- # temporary "freetype-config" workaround for https://github.com/docker-library/php/issues/865 (https://bugs.php.net/bug.php?id=76324)
465- RUN { echo '#!/bin/sh'; echo 'exec pkg-config "$@" freetype2'; } > /usr/local/bin/freetype-config && chmod +x /usr/local/bin/freetype-config
466-
467- {{ ) else "" end -}}
468440ENTRYPOINT ["docker-php-entrypoint"]
469441{{ if env.variant == "apache" then ( -}}
470442# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
0 commit comments