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

Use jq's IN() instead of index()

Browse Source 
The end result is the same, but the construction is more ergonomic.
This commit is contained in:
Tianon Gravi
2024-10-16 14:54:36 -07:00
parent 39c19b7c18
commit cde742a8d3
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile-linux.template
View File

@ -103,7 +103,7 @@ RUN set -eux; \
"$APACHE_LOCK_DIR" \ "$APACHE_LOCK_DIR" \
"$APACHE_RUN_DIR" \ "$APACHE_RUN_DIR" \
"$APACHE_LOG_DIR" \ "$APACHE_LOG_DIR" \
{{ if [ "bullseye" ] | index(env.suite) then "" else ( -}} {{ if env.suite == "bullseye" then "" else ( -}}
# https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205 # https://salsa.debian.org/apache-team/apache2/-/commit/b97ca8714890ead1ba6c095699dde752e8433205
"$APACHE_RUN_DIR/socks" \ "$APACHE_RUN_DIR/socks" \
{{ ) end -}} {{ ) end -}}
@ -326,7 +326,7 @@ RUN set -eux; \
# https://github.com/docker-library/php/issues/822 # https://github.com/docker-library/php/issues/822
--with-pic \ --with-pic \
\ \
{{ if [ "8.1" ] | index(env.version | rtrimstr("-rc")) then ( -}} {{ if env.version | rtrimstr("-rc") == "8.1" then ( -}}
# --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236). # --enable-ftp is included here for compatibility with existing versions. ftp_ssl_connect() needed ftp to be compiled statically before PHP 7.0 (see https://github.com/docker-library/php/issues/236).
--enable-ftp \ --enable-ftp \
{{ ) else "" end -}} {{ ) else "" end -}}
@ -348,7 +348,7 @@ RUN set -eux; \
--with-readline \ --with-readline \
--with-zlib \ --with-zlib \
\ \
{{ if [ "cli", "zts" ] | index(env.variant) then ( -}} {{ if env.variant | IN("cli", "zts") then ( -}}
# https://github.com/docker-library/php/pull/1259 # https://github.com/docker-library/php/pull/1259
--enable-phpdbg \ --enable-phpdbg \
--enable-phpdbg-readline \ --enable-phpdbg-readline \
@ -360,7 +360,7 @@ RUN set -eux; \
# in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear")
--with-pear \ --with-pear \
\ \
{{ if [ "8.1", "8.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} {{ if env.version | rtrimstr("-rc") | IN("8.1", "8.2") then ( -}}
# bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+) # bundled pcre does not support JIT on riscv64 until 10.41 (php 8.3+)
# https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c # https://github.com/PCRE2Project/pcre2/commits/pcre2-10.41/src/sljit/sljitNativeRISCV_64.c
# https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib # https://github.com/php/php-src/tree/php-8.3.0/ext/pcre/pcre2lib
@ -374,7 +374,7 @@ RUN set -eux; \
--with-libdir="lib/$debMultiarch" \ --with-libdir="lib/$debMultiarch" \
{{ ) end -}} {{ ) end -}}
{{ # https://github.com/docker-library/php/issues/280 -}} {{ # https://github.com/docker-library/php/issues/280 -}}
{{ if [ "cli", "zts" ] | index(env.variant) then "" else ( -}} {{ if env.variant | IN("cli", "zts") then "" else ( -}}
\ \
--disable-cgi \ --disable-cgi \
{{ ) end -}} {{ ) end -}}
@ -397,7 +397,7 @@ RUN set -eux; \
--enable-zts \ --enable-zts \
# https://externals.io/message/118859 # https://externals.io/message/118859
--disable-zend-signals \ --disable-zend-signals \
{{ if [ "8.1", "8.2" ] | index(env.version | rtrimstr("-rc")) then ( -}} {{ if env.version | rtrimstr("-rc") | IN("8.1", "8.2") then ( -}}
--enable-zend-max-execution-timers \ --enable-zend-max-execution-timers \
{{ ) else "" end -}} {{ ) else "" end -}}
{{ ) else "" end -}} {{ ) else "" end -}}