diff --git a/7.1/alpine3.10/cli/Dockerfile b/7.1/alpine3.10/cli/Dockerfile index 256ca3b9f0..72aa124ff2 100644 --- a/7.1/alpine3.10/cli/Dockerfile +++ b/7.1/alpine3.10/cli/Dockerfile @@ -131,6 +131,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/alpine3.10/fpm/Dockerfile b/7.1/alpine3.10/fpm/Dockerfile index 688b64bc36..87cf13b185 100644 --- a/7.1/alpine3.10/fpm/Dockerfile +++ b/7.1/alpine3.10/fpm/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/alpine3.10/zts/Dockerfile b/7.1/alpine3.10/zts/Dockerfile index 5016241fce..2ce61eae01 100644 --- a/7.1/alpine3.10/zts/Dockerfile +++ b/7.1/alpine3.10/zts/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/alpine3.9/cli/Dockerfile b/7.1/alpine3.9/cli/Dockerfile index 672edef933..6b1b20f7c5 100644 --- a/7.1/alpine3.9/cli/Dockerfile +++ b/7.1/alpine3.9/cli/Dockerfile @@ -131,6 +131,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/alpine3.9/fpm/Dockerfile b/7.1/alpine3.9/fpm/Dockerfile index 0623783fe0..b98bd37408 100644 --- a/7.1/alpine3.9/fpm/Dockerfile +++ b/7.1/alpine3.9/fpm/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/alpine3.9/zts/Dockerfile b/7.1/alpine3.9/zts/Dockerfile index 000f9d77bd..08ad34c298 100644 --- a/7.1/alpine3.9/zts/Dockerfile +++ b/7.1/alpine3.9/zts/Dockerfile @@ -132,6 +132,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/buster/apache/Dockerfile b/7.1/buster/apache/Dockerfile index 89da2be97b..d6e41aed80 100644 --- a/7.1/buster/apache/Dockerfile +++ b/7.1/buster/apache/Dockerfile @@ -208,6 +208,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/buster/cli/Dockerfile b/7.1/buster/cli/Dockerfile index d2e6be3731..4542b3a6a5 100644 --- a/7.1/buster/cli/Dockerfile +++ b/7.1/buster/cli/Dockerfile @@ -148,6 +148,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/buster/fpm/Dockerfile b/7.1/buster/fpm/Dockerfile index a67d23b25a..a5bffd136e 100644 --- a/7.1/buster/fpm/Dockerfile +++ b/7.1/buster/fpm/Dockerfile @@ -149,6 +149,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/buster/zts/Dockerfile b/7.1/buster/zts/Dockerfile index 3d63572d34..942b27e4c9 100644 --- a/7.1/buster/zts/Dockerfile +++ b/7.1/buster/zts/Dockerfile @@ -149,6 +149,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/stretch/apache/Dockerfile b/7.1/stretch/apache/Dockerfile index 76c8d3599c..922f79ddbc 100644 --- a/7.1/stretch/apache/Dockerfile +++ b/7.1/stretch/apache/Dockerfile @@ -208,6 +208,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/stretch/cli/Dockerfile b/7.1/stretch/cli/Dockerfile index 226c8ebf4d..8176aedeaf 100644 --- a/7.1/stretch/cli/Dockerfile +++ b/7.1/stretch/cli/Dockerfile @@ -148,6 +148,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/stretch/fpm/Dockerfile b/7.1/stretch/fpm/Dockerfile index b21acd89f2..02c478a864 100644 --- a/7.1/stretch/fpm/Dockerfile +++ b/7.1/stretch/fpm/Dockerfile @@ -149,6 +149,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.1/stretch/zts/Dockerfile b/7.1/stretch/zts/Dockerfile index 589cc46b95..2771c987af 100644 --- a/7.1/stretch/zts/Dockerfile +++ b/7.1/stretch/zts/Dockerfile @@ -149,6 +149,9 @@ RUN set -eux; \ --enable-mbstring \ # --enable-mysqlnd is included here because it's harder to compile after the fact than extensions are (since it's a plugin for several extensions, not an extension in itself) --enable-mysqlnd \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/alpine3.10/cli/Dockerfile b/7.2/alpine3.10/cli/Dockerfile index 2eacd1903e..9feff68e72 100644 --- a/7.2/alpine3.10/cli/Dockerfile +++ b/7.2/alpine3.10/cli/Dockerfile @@ -137,6 +137,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/alpine3.10/fpm/Dockerfile b/7.2/alpine3.10/fpm/Dockerfile index 7cc74a035c..f9ae94bdb9 100644 --- a/7.2/alpine3.10/fpm/Dockerfile +++ b/7.2/alpine3.10/fpm/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/alpine3.10/zts/Dockerfile b/7.2/alpine3.10/zts/Dockerfile index 3b8bba086d..6a6296cbe5 100644 --- a/7.2/alpine3.10/zts/Dockerfile +++ b/7.2/alpine3.10/zts/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/alpine3.9/cli/Dockerfile b/7.2/alpine3.9/cli/Dockerfile index 7ef9ea56a9..cc049309de 100644 --- a/7.2/alpine3.9/cli/Dockerfile +++ b/7.2/alpine3.9/cli/Dockerfile @@ -137,6 +137,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/alpine3.9/fpm/Dockerfile b/7.2/alpine3.9/fpm/Dockerfile index 083c19efc6..bab13e76fe 100644 --- a/7.2/alpine3.9/fpm/Dockerfile +++ b/7.2/alpine3.9/fpm/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/alpine3.9/zts/Dockerfile b/7.2/alpine3.9/zts/Dockerfile index 9a11702bd2..dcf1b9b1ce 100644 --- a/7.2/alpine3.9/zts/Dockerfile +++ b/7.2/alpine3.9/zts/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/buster/apache/Dockerfile b/7.2/buster/apache/Dockerfile index 68d0b0e704..4f41fd6614 100644 --- a/7.2/buster/apache/Dockerfile +++ b/7.2/buster/apache/Dockerfile @@ -214,6 +214,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/buster/cli/Dockerfile b/7.2/buster/cli/Dockerfile index da9362dc93..b736b72444 100644 --- a/7.2/buster/cli/Dockerfile +++ b/7.2/buster/cli/Dockerfile @@ -154,6 +154,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/buster/fpm/Dockerfile b/7.2/buster/fpm/Dockerfile index 2cd2c80c57..da8b35b07e 100644 --- a/7.2/buster/fpm/Dockerfile +++ b/7.2/buster/fpm/Dockerfile @@ -155,6 +155,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/buster/zts/Dockerfile b/7.2/buster/zts/Dockerfile index 0222fbc1a2..4b1f59cf72 100644 --- a/7.2/buster/zts/Dockerfile +++ b/7.2/buster/zts/Dockerfile @@ -155,6 +155,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index 637b920008..fe38966b7a 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -226,6 +226,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index 879dd1d103..d83c7e6893 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -166,6 +166,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index da6015ab56..5d1aa82ebd 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -167,6 +167,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index 216efd6e00..8ef18a1694 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -167,6 +167,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/alpine3.10/cli/Dockerfile b/7.3/alpine3.10/cli/Dockerfile index 8618cf3db8..b7404fdc94 100644 --- a/7.3/alpine3.10/cli/Dockerfile +++ b/7.3/alpine3.10/cli/Dockerfile @@ -137,6 +137,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/alpine3.10/fpm/Dockerfile b/7.3/alpine3.10/fpm/Dockerfile index 0d9f24e18b..7bc0139e77 100644 --- a/7.3/alpine3.10/fpm/Dockerfile +++ b/7.3/alpine3.10/fpm/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/alpine3.10/zts/Dockerfile b/7.3/alpine3.10/zts/Dockerfile index e417a30e0a..fab6523e27 100644 --- a/7.3/alpine3.10/zts/Dockerfile +++ b/7.3/alpine3.10/zts/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/alpine3.9/cli/Dockerfile b/7.3/alpine3.9/cli/Dockerfile index c3a4cb836d..772c12cefe 100644 --- a/7.3/alpine3.9/cli/Dockerfile +++ b/7.3/alpine3.9/cli/Dockerfile @@ -137,6 +137,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/alpine3.9/fpm/Dockerfile b/7.3/alpine3.9/fpm/Dockerfile index d4b87797d3..5e551454a8 100644 --- a/7.3/alpine3.9/fpm/Dockerfile +++ b/7.3/alpine3.9/fpm/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/alpine3.9/zts/Dockerfile b/7.3/alpine3.9/zts/Dockerfile index e693bda398..8333625b9c 100644 --- a/7.3/alpine3.9/zts/Dockerfile +++ b/7.3/alpine3.9/zts/Dockerfile @@ -138,6 +138,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile index d3f84e6b67..cf7e45e3e9 100644 --- a/7.3/buster/apache/Dockerfile +++ b/7.3/buster/apache/Dockerfile @@ -214,6 +214,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile index 46bb9b5f49..69587e0c3b 100644 --- a/7.3/buster/cli/Dockerfile +++ b/7.3/buster/cli/Dockerfile @@ -154,6 +154,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile index ba990558ec..cfe1e2e2f8 100644 --- a/7.3/buster/fpm/Dockerfile +++ b/7.3/buster/fpm/Dockerfile @@ -155,6 +155,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile index c17b7e9481..8a2b72f826 100644 --- a/7.3/buster/zts/Dockerfile +++ b/7.3/buster/zts/Dockerfile @@ -155,6 +155,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/stretch/apache/Dockerfile b/7.3/stretch/apache/Dockerfile index 075fa1af7f..9b29b5fdb8 100644 --- a/7.3/stretch/apache/Dockerfile +++ b/7.3/stretch/apache/Dockerfile @@ -226,6 +226,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/stretch/cli/Dockerfile b/7.3/stretch/cli/Dockerfile index b005ddabb4..9b3153038b 100644 --- a/7.3/stretch/cli/Dockerfile +++ b/7.3/stretch/cli/Dockerfile @@ -166,6 +166,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/stretch/fpm/Dockerfile b/7.3/stretch/fpm/Dockerfile index 5efc653424..5035420a29 100644 --- a/7.3/stretch/fpm/Dockerfile +++ b/7.3/stretch/fpm/Dockerfile @@ -167,6 +167,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.3/stretch/zts/Dockerfile b/7.3/stretch/zts/Dockerfile index bc05e2eed4..615d3a72b0 100644 --- a/7.3/stretch/zts/Dockerfile +++ b/7.3/stretch/zts/Dockerfile @@ -167,6 +167,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/alpine3.10/cli/Dockerfile b/7.4-rc/alpine3.10/cli/Dockerfile index d7aab9c69e..a237891390 100644 --- a/7.4-rc/alpine3.10/cli/Dockerfile +++ b/7.4-rc/alpine3.10/cli/Dockerfile @@ -139,6 +139,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/alpine3.10/fpm/Dockerfile b/7.4-rc/alpine3.10/fpm/Dockerfile index 2aacfb2b27..4be2714fc4 100644 --- a/7.4-rc/alpine3.10/fpm/Dockerfile +++ b/7.4-rc/alpine3.10/fpm/Dockerfile @@ -140,6 +140,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/alpine3.10/zts/Dockerfile b/7.4-rc/alpine3.10/zts/Dockerfile index bc362ec039..2b018d0861 100644 --- a/7.4-rc/alpine3.10/zts/Dockerfile +++ b/7.4-rc/alpine3.10/zts/Dockerfile @@ -140,6 +140,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/buster/apache/Dockerfile b/7.4-rc/buster/apache/Dockerfile index 05fafefdcb..ff40ab2242 100644 --- a/7.4-rc/buster/apache/Dockerfile +++ b/7.4-rc/buster/apache/Dockerfile @@ -215,6 +215,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/buster/cli/Dockerfile b/7.4-rc/buster/cli/Dockerfile index 16cb169f6a..acf6011e5b 100644 --- a/7.4-rc/buster/cli/Dockerfile +++ b/7.4-rc/buster/cli/Dockerfile @@ -155,6 +155,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/buster/fpm/Dockerfile b/7.4-rc/buster/fpm/Dockerfile index 3d6d81327c..3cb534dd14 100644 --- a/7.4-rc/buster/fpm/Dockerfile +++ b/7.4-rc/buster/fpm/Dockerfile @@ -156,6 +156,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/7.4-rc/buster/zts/Dockerfile b/7.4-rc/buster/zts/Dockerfile index ce28f40847..d6e5839ae8 100644 --- a/7.4-rc/buster/zts/Dockerfile +++ b/7.4-rc/buster/zts/Dockerfile @@ -156,6 +156,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 406f1fac64..82804e51d9 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -133,6 +133,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index a615ac022e..ef77729003 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -161,6 +161,9 @@ RUN set -eux; \ --with-password-argon2 \ # https://wiki.php.net/rfc/libsodium --with-sodium=shared \ +# always build against system sqlite3 (https://github.com/php/php-src/commit/6083a387a81dbbd66d6316a3a12a63f06d5f7109) + --with-pdo-sqlite=/usr \ + --with-sqlite3=/usr \ \ --with-curl \ --with-libedit \