From eee43f690e25e297571c8a0c1f46e15561ecdd65 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 11 Aug 2021 09:50:10 -0700 Subject: [PATCH] Switch from libedit back to readline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this, I cannot input UTF-8 characters, no matter what I set `LANG` to, but this fixes it such that `LANG=C.UTF-8` works again for inputting UTF-8 characters like `💩`. --- 7.3/alpine3.13/cli/Dockerfile | 4 ++-- 7.3/alpine3.13/fpm/Dockerfile | 4 ++-- 7.3/alpine3.13/zts/Dockerfile | 4 ++-- 7.3/alpine3.14/cli/Dockerfile | 4 ++-- 7.3/alpine3.14/fpm/Dockerfile | 4 ++-- 7.3/alpine3.14/zts/Dockerfile | 4 ++-- 7.3/bullseye/apache/Dockerfile | 4 ++-- 7.3/bullseye/cli/Dockerfile | 4 ++-- 7.3/bullseye/fpm/Dockerfile | 4 ++-- 7.3/bullseye/zts/Dockerfile | 4 ++-- 7.3/buster/apache/Dockerfile | 4 ++-- 7.3/buster/cli/Dockerfile | 4 ++-- 7.3/buster/fpm/Dockerfile | 4 ++-- 7.3/buster/zts/Dockerfile | 4 ++-- 7.4/alpine3.13/cli/Dockerfile | 4 ++-- 7.4/alpine3.13/fpm/Dockerfile | 4 ++-- 7.4/alpine3.13/zts/Dockerfile | 4 ++-- 7.4/alpine3.14/cli/Dockerfile | 4 ++-- 7.4/alpine3.14/fpm/Dockerfile | 4 ++-- 7.4/alpine3.14/zts/Dockerfile | 4 ++-- 7.4/bullseye/apache/Dockerfile | 4 ++-- 7.4/bullseye/cli/Dockerfile | 4 ++-- 7.4/bullseye/fpm/Dockerfile | 4 ++-- 7.4/bullseye/zts/Dockerfile | 4 ++-- 7.4/buster/apache/Dockerfile | 4 ++-- 7.4/buster/cli/Dockerfile | 4 ++-- 7.4/buster/fpm/Dockerfile | 4 ++-- 7.4/buster/zts/Dockerfile | 4 ++-- 8.0/alpine3.13/cli/Dockerfile | 4 ++-- 8.0/alpine3.13/fpm/Dockerfile | 4 ++-- 8.0/alpine3.14/cli/Dockerfile | 4 ++-- 8.0/alpine3.14/fpm/Dockerfile | 4 ++-- 8.0/bullseye/apache/Dockerfile | 4 ++-- 8.0/bullseye/cli/Dockerfile | 4 ++-- 8.0/bullseye/fpm/Dockerfile | 4 ++-- 8.0/bullseye/zts/Dockerfile | 4 ++-- 8.0/buster/apache/Dockerfile | 4 ++-- 8.0/buster/cli/Dockerfile | 4 ++-- 8.0/buster/fpm/Dockerfile | 4 ++-- 8.0/buster/zts/Dockerfile | 4 ++-- 8.1-rc/alpine3.13/cli/Dockerfile | 4 ++-- 8.1-rc/alpine3.13/fpm/Dockerfile | 4 ++-- 8.1-rc/alpine3.14/cli/Dockerfile | 4 ++-- 8.1-rc/alpine3.14/fpm/Dockerfile | 4 ++-- 8.1-rc/bullseye/apache/Dockerfile | 4 ++-- 8.1-rc/bullseye/cli/Dockerfile | 4 ++-- 8.1-rc/bullseye/fpm/Dockerfile | 4 ++-- 8.1-rc/bullseye/zts/Dockerfile | 4 ++-- 8.1-rc/buster/apache/Dockerfile | 4 ++-- 8.1-rc/buster/cli/Dockerfile | 4 ++-- 8.1-rc/buster/fpm/Dockerfile | 4 ++-- 8.1-rc/buster/zts/Dockerfile | 4 ++-- Dockerfile-alpine.template | 4 ++-- Dockerfile-debian.template | 4 ++-- 54 files changed, 108 insertions(+), 108 deletions(-) diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile index b852aa46cc..45624e92f6 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 46839f7a4d..694395e860 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 bec9d83cc6..6ce6c04194 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 c354d0f2a8..4524afa0dc 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 9805ca44dc..9410f270f9 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 c62e9441f7..9bf4999e78 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 330614a391..9938212f82 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 ab04d87d57..f6f7bb1031 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 e6cf80a1de..8facdfdfb2 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 5bede3d04e..7add5ab0ea 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 b3c2e90636..59b474a300 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 57c65dc63c..14d6317cf1 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 3056a579e8..f5bca9e833 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 65f6173cc6..b204ec92f3 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 30c9b5795a..5b5c7b6cfe 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 2928a7ac14..39c30c0358 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 fdec08f03b..40338f4293 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 59e7612e55..10193f02fc 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 8987d10f58..9d04329b8a 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 a8aedcfd97..c842480a6a 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 b9d3c66a1d..2b86b1c6c4 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 299a1c39f8..d01b249de4 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 ca0d16c1ec..30cf15025a 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 ed060709ff..cab0c618ff 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 c5bc2b2be1..0af91cc11e 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 6a6b6ac531..6f85a239ab 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 9daa5c52bd..97d6640ed4 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 1075c6b085..b6845aa71c 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 739fc7806d..dca22367ea 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 be41bd826c..08b9a9ddfd 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 0a37a0d1fb..c0076e38cb 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 579d999e69..32b3d6f2be 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 e0a37afc8f..290b1fa1a0 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 86af886ce3..b97f6c393e 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 b7e20b7a01..41a453c00e 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 44800ea34d..fcc49e31ba 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 0069e33ccb..daa1902d83 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 8f9053e2f9..d7fb9780c8 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 8bb4ba4b87..24bdc300e9 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 e690c02402..e1ff32dcd8 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 4ecc440f08..909d2e5d0c 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 57b76c3f5a..4ba068170c 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 7e5f928bc4..e876b88262 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 07011009fd..4f70c0af3f 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 d61456cdbb..b89e315a52 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 eb7b35c912..49201c0459 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 39438d8b5b..f848d5501e 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 7ef7536db5..689f9147f4 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 76fdb545f3..dfb40e3522 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 147356e5fc..bbe57aef0f 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 0c21073771..18a2b65019 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 0b59989d4c..9b8ae9d7c9 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 8d6e19a8c0..d3d86603e0 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 6938c5b95b..5270cc6ce4 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 ( -}}