From 56c997e39687f6bf41f52cca7ca523fed2f4b865 Mon Sep 17 00:00:00 2001
From: Graham Campbell <hello@gjcampbell.co.uk>
Date: Wed, 11 Dec 2024 10:54:35 +0000
Subject: [PATCH] Upgrade sqlite to 3.47.2 for PHP 8.1 and up

---
 php-81/Dockerfile | 24 ++++++++++++++++++++++--
 php-82/Dockerfile |  5 +++--
 php-83/Dockerfile |  5 +++--
 php-84/Dockerfile |  5 +++--
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/php-81/Dockerfile b/php-81/Dockerfile
index 55fd6c92..ffd28885 100644
--- a/php-81/Dockerfile
+++ b/php-81/Dockerfile
@@ -374,14 +374,34 @@ RUN ./configure --prefix=${INSTALL_DIR}
 RUN make && make install
 
 
+###############################################################################
+# SQLite
+# Since PHP 7.4, libsqlite must be installed (https://github.com/php/php-src/blob/99b8e67615159fc600a615e1e97f2d1cf18f14cb/UPGRADING#L616-L619)
+# Laravel 11 requires SQLite 3.35.0 or higher and Drupal 10 also requires a
+# newer version than the system version of 3.7.17.
+# https://laravel.com/docs/11.x/upgrade#sqlite-minimum-version
+# https://www.sqlite.org/changes.html
+# Needed by:
+#   - php
+RUN LD_LIBRARY_PATH= yum install -y tcl
+ENV VERSION_SQLITE=3.47.2
+ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
+RUN set -xe; \
+    mkdir -p ${SQLITE_BUILD_DIR}; \
+    curl -Ls https://github.com/sqlite/sqlite/archive/refs/tags/version-${VERSION_SQLITE}.tar.gz \
+    | tar xzC ${SQLITE_BUILD_DIR} --strip-components=1
+WORKDIR ${SQLITE_BUILD_DIR}
+RUN ./configure --prefix=${INSTALL_DIR}
+RUN make && make install
+
+
 ###############################################################################
 # Install some dev files for using old libraries already on the system
 # readline-devel : needed for the readline extension
 # gettext-devel : needed for the --with-gettext flag
 # libicu-devel : needed for intl
 # libxslt-devel : needed for the XSL extension
-# sqlite-devel : Since PHP 7.4 this must be installed (https://github.com/php/php-src/blob/99b8e67615159fc600a615e1e97f2d1cf18f14cb/UPGRADING#L616-L619)
-RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel sqlite-devel
+RUN LD_LIBRARY_PATH= yum install -y readline-devel gettext-devel libicu-devel libxslt-devel
 
 
 # Note: this variable is used when building extra/custom extensions, do not remove
diff --git a/php-82/Dockerfile b/php-82/Dockerfile
index ff39c119..541c4166 100644
--- a/php-82/Dockerfile
+++ b/php-82/Dockerfile
@@ -377,13 +377,14 @@ RUN make && make install
 ###############################################################################
 # SQLite
 # Since PHP 7.4, libsqlite must be installed (https://github.com/php/php-src/blob/99b8e67615159fc600a615e1e97f2d1cf18f14cb/UPGRADING#L616-L619)
-# Laravel 11 requires SQLite 3.35.0 or higher. The system version is 3.7.17.
+# Laravel 11 requires SQLite 3.35.0 or higher and Drupal 10 also requires a
+# newer version than the system version of 3.7.17.
 # https://laravel.com/docs/11.x/upgrade#sqlite-minimum-version
 # https://www.sqlite.org/changes.html
 # Needed by:
 #   - php
 RUN LD_LIBRARY_PATH= yum install -y tcl
-ENV VERSION_SQLITE=3.47.0
+ENV VERSION_SQLITE=3.47.2
 ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
 RUN set -xe; \
     mkdir -p ${SQLITE_BUILD_DIR}; \
diff --git a/php-83/Dockerfile b/php-83/Dockerfile
index c470cba8..79b15be2 100644
--- a/php-83/Dockerfile
+++ b/php-83/Dockerfile
@@ -377,13 +377,14 @@ RUN make && make install
 ###############################################################################
 # SQLite
 # Since PHP 7.4, libsqlite must be installed (https://github.com/php/php-src/blob/99b8e67615159fc600a615e1e97f2d1cf18f14cb/UPGRADING#L616-L619)
-# Laravel 11 requires SQLite 3.35.0 or higher. The system version is 3.7.17.
+# Laravel 11 requires SQLite 3.35.0 or higher and Drupal 10 also requires a
+# newer version than the system version of 3.7.17.
 # https://laravel.com/docs/11.x/upgrade#sqlite-minimum-version
 # https://www.sqlite.org/changes.html
 # Needed by:
 #   - php
 RUN LD_LIBRARY_PATH= yum install -y tcl
-ENV VERSION_SQLITE=3.47.0
+ENV VERSION_SQLITE=3.47.2
 ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
 RUN set -xe; \
     mkdir -p ${SQLITE_BUILD_DIR}; \
diff --git a/php-84/Dockerfile b/php-84/Dockerfile
index 4984e5d6..a8931946 100644
--- a/php-84/Dockerfile
+++ b/php-84/Dockerfile
@@ -380,13 +380,14 @@ RUN make && make install
 # PHP 8.4 requires SQLite 3.13.0 or higher because the build uses the
 # `SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION` constant.
 # See https://github.com/brefphp/aws-lambda-layers/pull/185
-# Moreover, Laravel 11 requires SQLite 3.35.0 or higher. The system version is 3.7.17.
+# Laravel 11 requires SQLite 3.35.0 or higher and Drupal 10 also requires a
+# newer version than the system version of 3.7.17.
 # https://laravel.com/docs/11.x/upgrade#sqlite-minimum-version
 # https://www.sqlite.org/changes.html
 # Needed by:
 #   - php
 RUN LD_LIBRARY_PATH= yum install -y tcl
-ENV VERSION_SQLITE=3.47.0
+ENV VERSION_SQLITE=3.47.2
 ENV SQLITE_BUILD_DIR=${BUILD_DIR}/sqlite
 RUN set -xe; \
     mkdir -p ${SQLITE_BUILD_DIR}; \