diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile index b852aa46..45624e92 100644 --- a/7.3/alpine3.13/cli/Dockerfile +++ b/7.3/alpine3.13/cli/Dockerfile @@ -96,10 +96,10 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -139,8 +139,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile index 46839f7a..694395e8 100644 --- a/7.3/alpine3.13/fpm/Dockerfile +++ b/7.3/alpine3.13/fpm/Dockerfile @@ -98,10 +98,10 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -141,8 +141,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile index bec9d83c..6ce6c041 100644 --- a/7.3/alpine3.13/zts/Dockerfile +++ b/7.3/alpine3.13/zts/Dockerfile @@ -98,10 +98,10 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -141,8 +141,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile index c354d0f2..4524afa0 100644 --- a/7.3/alpine3.14/cli/Dockerfile +++ b/7.3/alpine3.14/cli/Dockerfile @@ -95,10 +95,10 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -138,8 +138,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile index 9805ca44..9410f270 100644 --- a/7.3/alpine3.14/fpm/Dockerfile +++ b/7.3/alpine3.14/fpm/Dockerfile @@ -97,10 +97,10 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -140,8 +140,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile index c62e9441..9bf4999e 100644 --- a/7.3/alpine3.14/zts/Dockerfile +++ b/7.3/alpine3.14/zts/Dockerfile @@ -97,10 +97,10 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -140,8 +140,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/bullseye/apache/Dockerfile b/7.3/bullseye/apache/Dockerfile index 330614a3..9938212f 100644 --- a/7.3/bullseye/apache/Dockerfile +++ b/7.3/bullseye/apache/Dockerfile @@ -165,7 +165,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -217,8 +217,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/bullseye/cli/Dockerfile b/7.3/bullseye/cli/Dockerfile index ab04d87d..f6f7bb10 100644 --- a/7.3/bullseye/cli/Dockerfile +++ b/7.3/bullseye/cli/Dockerfile @@ -107,7 +107,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/bullseye/fpm/Dockerfile b/7.3/bullseye/fpm/Dockerfile index e6cf80a1..8facdfdf 100644 --- a/7.3/bullseye/fpm/Dockerfile +++ b/7.3/bullseye/fpm/Dockerfile @@ -106,7 +106,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -158,8 +158,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/bullseye/zts/Dockerfile b/7.3/bullseye/zts/Dockerfile index 5bede3d0..7add5ab0 100644 --- a/7.3/bullseye/zts/Dockerfile +++ b/7.3/bullseye/zts/Dockerfile @@ -106,7 +106,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -158,8 +158,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile index b3c2e906..59b474a3 100644 --- a/7.3/buster/apache/Dockerfile +++ b/7.3/buster/apache/Dockerfile @@ -165,7 +165,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -217,8 +217,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile index 57c65dc6..14d6317c 100644 --- a/7.3/buster/cli/Dockerfile +++ b/7.3/buster/cli/Dockerfile @@ -107,7 +107,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile index 3056a579..f5bca9e8 100644 --- a/7.3/buster/fpm/Dockerfile +++ b/7.3/buster/fpm/Dockerfile @@ -106,7 +106,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -158,8 +158,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile index 65f6173c..b204ec92 100644 --- a/7.3/buster/zts/Dockerfile +++ b/7.3/buster/zts/Dockerfile @@ -106,7 +106,7 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -158,8 +158,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # bundled pcre does not support JIT on s390x diff --git a/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile index 30c9b579..5b5c7b6c 100644 --- a/7.4/alpine3.13/cli/Dockerfile +++ b/7.4/alpine3.13/cli/Dockerfile @@ -96,12 +96,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -141,8 +141,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile index 2928a7ac..39c30c03 100644 --- a/7.4/alpine3.13/fpm/Dockerfile +++ b/7.4/alpine3.13/fpm/Dockerfile @@ -98,12 +98,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -143,8 +143,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile index fdec08f0..40338f42 100644 --- a/7.4/alpine3.13/zts/Dockerfile +++ b/7.4/alpine3.13/zts/Dockerfile @@ -98,12 +98,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -143,8 +143,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile index 59e7612e..10193f02 100644 --- a/7.4/alpine3.14/cli/Dockerfile +++ b/7.4/alpine3.14/cli/Dockerfile @@ -95,12 +95,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -140,8 +140,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/alpine3.14/fpm/Dockerfile b/7.4/alpine3.14/fpm/Dockerfile index 8987d10f..9d04329b 100644 --- a/7.4/alpine3.14/fpm/Dockerfile +++ b/7.4/alpine3.14/fpm/Dockerfile @@ -97,12 +97,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -142,8 +142,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/alpine3.14/zts/Dockerfile b/7.4/alpine3.14/zts/Dockerfile index a8aedcfd..c842480a 100644 --- a/7.4/alpine3.14/zts/Dockerfile +++ b/7.4/alpine3.14/zts/Dockerfile @@ -97,12 +97,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -142,8 +142,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/bullseye/apache/Dockerfile b/7.4/bullseye/apache/Dockerfile index b9d3c66a..2b86b1c6 100644 --- a/7.4/bullseye/apache/Dockerfile +++ b/7.4/bullseye/apache/Dockerfile @@ -165,8 +165,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -218,8 +218,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/bullseye/cli/Dockerfile b/7.4/bullseye/cli/Dockerfile index 299a1c39..d01b249d 100644 --- a/7.4/bullseye/cli/Dockerfile +++ b/7.4/bullseye/cli/Dockerfile @@ -107,8 +107,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -160,8 +160,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/bullseye/fpm/Dockerfile b/7.4/bullseye/fpm/Dockerfile index ca0d16c1..30cf1502 100644 --- a/7.4/bullseye/fpm/Dockerfile +++ b/7.4/bullseye/fpm/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/bullseye/zts/Dockerfile b/7.4/bullseye/zts/Dockerfile index ed060709..cab0c618 100644 --- a/7.4/bullseye/zts/Dockerfile +++ b/7.4/bullseye/zts/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/buster/apache/Dockerfile b/7.4/buster/apache/Dockerfile index c5bc2b2b..0af91cc1 100644 --- a/7.4/buster/apache/Dockerfile +++ b/7.4/buster/apache/Dockerfile @@ -165,8 +165,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -218,8 +218,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/buster/cli/Dockerfile b/7.4/buster/cli/Dockerfile index 6a6b6ac5..6f85a239 100644 --- a/7.4/buster/cli/Dockerfile +++ b/7.4/buster/cli/Dockerfile @@ -107,8 +107,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -160,8 +160,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/buster/fpm/Dockerfile b/7.4/buster/fpm/Dockerfile index 9daa5c52..97d6640e 100644 --- a/7.4/buster/fpm/Dockerfile +++ b/7.4/buster/fpm/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/7.4/buster/zts/Dockerfile b/7.4/buster/zts/Dockerfile index 1075c6b0..b6845aa7 100644 --- a/7.4/buster/zts/Dockerfile +++ b/7.4/buster/zts/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/alpine3.13/cli/Dockerfile b/8.0/alpine3.13/cli/Dockerfile index 739fc780..dca22367 100644 --- a/8.0/alpine3.13/cli/Dockerfile +++ b/8.0/alpine3.13/cli/Dockerfile @@ -96,12 +96,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -141,8 +141,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/alpine3.13/fpm/Dockerfile b/8.0/alpine3.13/fpm/Dockerfile index be41bd82..08b9a9dd 100644 --- a/8.0/alpine3.13/fpm/Dockerfile +++ b/8.0/alpine3.13/fpm/Dockerfile @@ -98,12 +98,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -143,8 +143,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/alpine3.14/cli/Dockerfile b/8.0/alpine3.14/cli/Dockerfile index 0a37a0d1..c0076e38 100644 --- a/8.0/alpine3.14/cli/Dockerfile +++ b/8.0/alpine3.14/cli/Dockerfile @@ -95,12 +95,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -140,8 +140,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/alpine3.14/fpm/Dockerfile b/8.0/alpine3.14/fpm/Dockerfile index 579d999e..32b3d6f2 100644 --- a/8.0/alpine3.14/fpm/Dockerfile +++ b/8.0/alpine3.14/fpm/Dockerfile @@ -97,12 +97,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -142,8 +142,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/bullseye/apache/Dockerfile b/8.0/bullseye/apache/Dockerfile index e0a37afc..290b1fa1 100644 --- a/8.0/bullseye/apache/Dockerfile +++ b/8.0/bullseye/apache/Dockerfile @@ -165,8 +165,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -218,8 +218,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/bullseye/cli/Dockerfile b/8.0/bullseye/cli/Dockerfile index 86af886c..b97f6c39 100644 --- a/8.0/bullseye/cli/Dockerfile +++ b/8.0/bullseye/cli/Dockerfile @@ -107,8 +107,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -160,8 +160,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/bullseye/fpm/Dockerfile b/8.0/bullseye/fpm/Dockerfile index b7e20b7a..41a453c0 100644 --- a/8.0/bullseye/fpm/Dockerfile +++ b/8.0/bullseye/fpm/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/bullseye/zts/Dockerfile b/8.0/bullseye/zts/Dockerfile index 44800ea3..fcc49e31 100644 --- a/8.0/bullseye/zts/Dockerfile +++ b/8.0/bullseye/zts/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile index 0069e33c..daa1902d 100644 --- a/8.0/buster/apache/Dockerfile +++ b/8.0/buster/apache/Dockerfile @@ -165,8 +165,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -218,8 +218,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile index 8f9053e2..d7fb9780 100644 --- a/8.0/buster/cli/Dockerfile +++ b/8.0/buster/cli/Dockerfile @@ -107,8 +107,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -160,8 +160,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile index 8bb4ba4b..24bdc300 100644 --- a/8.0/buster/fpm/Dockerfile +++ b/8.0/buster/fpm/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.0/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile index e690c024..e1ff32dc 100644 --- a/8.0/buster/zts/Dockerfile +++ b/8.0/buster/zts/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/alpine3.13/cli/Dockerfile b/8.1-rc/alpine3.13/cli/Dockerfile index 4ecc440f..909d2e5d 100644 --- a/8.1-rc/alpine3.13/cli/Dockerfile +++ b/8.1-rc/alpine3.13/cli/Dockerfile @@ -96,12 +96,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -141,8 +141,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/alpine3.13/fpm/Dockerfile b/8.1-rc/alpine3.13/fpm/Dockerfile index 57b76c3f..4ba06817 100644 --- a/8.1-rc/alpine3.13/fpm/Dockerfile +++ b/8.1-rc/alpine3.13/fpm/Dockerfile @@ -98,12 +98,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -143,8 +143,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/alpine3.14/cli/Dockerfile b/8.1-rc/alpine3.14/cli/Dockerfile index 7e5f928b..e876b882 100644 --- a/8.1-rc/alpine3.14/cli/Dockerfile +++ b/8.1-rc/alpine3.14/cli/Dockerfile @@ -95,12 +95,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -140,8 +140,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/alpine3.14/fpm/Dockerfile b/8.1-rc/alpine3.14/fpm/Dockerfile index 07011009..4f70c0af 100644 --- a/8.1-rc/alpine3.14/fpm/Dockerfile +++ b/8.1-rc/alpine3.14/fpm/Dockerfile @@ -97,12 +97,12 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ libsodium-dev \ libxml2-dev \ linux-headers \ oniguruma-dev \ openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -142,8 +142,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/bullseye/apache/Dockerfile b/8.1-rc/bullseye/apache/Dockerfile index d61456cd..b89e315a 100644 --- a/8.1-rc/bullseye/apache/Dockerfile +++ b/8.1-rc/bullseye/apache/Dockerfile @@ -165,8 +165,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -218,8 +218,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/bullseye/cli/Dockerfile b/8.1-rc/bullseye/cli/Dockerfile index eb7b35c9..49201c04 100644 --- a/8.1-rc/bullseye/cli/Dockerfile +++ b/8.1-rc/bullseye/cli/Dockerfile @@ -107,8 +107,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -160,8 +160,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/bullseye/fpm/Dockerfile b/8.1-rc/bullseye/fpm/Dockerfile index 39438d8b..f848d550 100644 --- a/8.1-rc/bullseye/fpm/Dockerfile +++ b/8.1-rc/bullseye/fpm/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/bullseye/zts/Dockerfile b/8.1-rc/bullseye/zts/Dockerfile index 7ef7536d..689f9147 100644 --- a/8.1-rc/bullseye/zts/Dockerfile +++ b/8.1-rc/bullseye/zts/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/buster/apache/Dockerfile b/8.1-rc/buster/apache/Dockerfile index 76fdb545..dfb40e35 100644 --- a/8.1-rc/buster/apache/Dockerfile +++ b/8.1-rc/buster/apache/Dockerfile @@ -165,8 +165,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -218,8 +218,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/buster/cli/Dockerfile b/8.1-rc/buster/cli/Dockerfile index 147356e5..bbe57aef 100644 --- a/8.1-rc/buster/cli/Dockerfile +++ b/8.1-rc/buster/cli/Dockerfile @@ -107,8 +107,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -160,8 +160,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/buster/fpm/Dockerfile b/8.1-rc/buster/fpm/Dockerfile index 0c210737..18a2b650 100644 --- a/8.1-rc/buster/fpm/Dockerfile +++ b/8.1-rc/buster/fpm/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1-rc/buster/zts/Dockerfile index 0b59989d..9b8ae9d7 100644 --- a/8.1-rc/buster/zts/Dockerfile +++ b/8.1-rc/buster/zts/Dockerfile @@ -106,8 +106,8 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ libonig-dev \ + libreadline-dev \ libsodium-dev \ libsqlite3-dev \ libssl-dev \ @@ -159,8 +159,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ # in PHP 7.4+, the pecl/pear installers are officially deprecated (requiring an explicit "--with-pear") diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 8d6e19a8..d3d86603 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -97,7 +97,6 @@ RUN set -eux; \ argon2-dev \ coreutils \ curl-dev \ - libedit-dev \ {{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} libsodium-dev \ {{ ) else "" end -}} @@ -112,6 +111,7 @@ RUN set -eux; \ oniguruma-dev \ {{ ) else "" end -}} openssl-dev \ + readline-dev \ sqlite-dev \ ; \ \ @@ -153,8 +153,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ {{ if (.version | version_id) | . >= ("7.4" | version_id) then ( -}} diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 6938c5b9..5270cc6c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -103,13 +103,13 @@ RUN set -eux; \ apt-get install -y --no-install-recommends \ libargon2-dev \ libcurl4-openssl-dev \ - libedit-dev \ {{ # oniguruma is part of mbstring in php 7.4+ if (.version | version_id) >= ("7.4" | version_id) then ( -}} libonig-dev \ {{ ) else "" end -}} + libreadline-dev \ {{ if (.version | version_id) >= ("7.2" | version_id) then ( -}} libsodium-dev \ {{ ) else "" end -}} @@ -165,8 +165,8 @@ RUN set -eux; \ --with-sqlite3=/usr \ \ --with-curl \ - --with-libedit \ --with-openssl \ + --with-readline \ --with-zlib \ \ {{ if (.version | version_id) | . >= ("7.4" | version_id) then ( -}}