diff --git a/11.1/php8.3/apache-bookworm/Dockerfile b/11.1/php8.3/apache-bookworm/Dockerfile index 790297ec2..95bcd6923 100644 --- a/11.1/php8.3/apache-bookworm/Dockerfile +++ b/11.1/php8.3/apache-bookworm/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.3/apache-bullseye/Dockerfile b/11.1/php8.3/apache-bullseye/Dockerfile index ea625fddd..6c742e4a1 100644 --- a/11.1/php8.3/apache-bullseye/Dockerfile +++ b/11.1/php8.3/apache-bullseye/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.3/fpm-bookworm/Dockerfile b/11.1/php8.3/fpm-bookworm/Dockerfile index cf9b9d221..b8aa6569b 100644 --- a/11.1/php8.3/fpm-bookworm/Dockerfile +++ b/11.1/php8.3/fpm-bookworm/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.3/fpm-bullseye/Dockerfile b/11.1/php8.3/fpm-bullseye/Dockerfile index 96f0cc5fb..4475d576a 100644 --- a/11.1/php8.3/fpm-bullseye/Dockerfile +++ b/11.1/php8.3/fpm-bullseye/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.4/apache-bookworm/Dockerfile b/11.1/php8.4/apache-bookworm/Dockerfile index b6f8ca951..26be1353a 100644 --- a/11.1/php8.4/apache-bookworm/Dockerfile +++ b/11.1/php8.4/apache-bookworm/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.4/apache-bullseye/Dockerfile b/11.1/php8.4/apache-bullseye/Dockerfile index 0c6f3abd0..fa8dffb16 100644 --- a/11.1/php8.4/apache-bullseye/Dockerfile +++ b/11.1/php8.4/apache-bullseye/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.4/fpm-bookworm/Dockerfile b/11.1/php8.4/fpm-bookworm/Dockerfile index a96cfcbd9..cbfbf5d35 100644 --- a/11.1/php8.4/fpm-bookworm/Dockerfile +++ b/11.1/php8.4/fpm-bookworm/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.1/php8.4/fpm-bullseye/Dockerfile b/11.1/php8.4/fpm-bullseye/Dockerfile index 50922b939..ae3c04e1d 100644 --- a/11.1/php8.4/fpm-bullseye/Dockerfile +++ b/11.1/php8.4/fpm-bullseye/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.3/apache-bookworm/Dockerfile b/11.2/php8.3/apache-bookworm/Dockerfile index 117ab2f92..6e359052b 100644 --- a/11.2/php8.3/apache-bookworm/Dockerfile +++ b/11.2/php8.3/apache-bookworm/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.3/apache-bullseye/Dockerfile b/11.2/php8.3/apache-bullseye/Dockerfile index e700ba4ad..6c97e5013 100644 --- a/11.2/php8.3/apache-bullseye/Dockerfile +++ b/11.2/php8.3/apache-bullseye/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.3/fpm-bookworm/Dockerfile b/11.2/php8.3/fpm-bookworm/Dockerfile index 86fc5c4e9..882305f13 100644 --- a/11.2/php8.3/fpm-bookworm/Dockerfile +++ b/11.2/php8.3/fpm-bookworm/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.3/fpm-bullseye/Dockerfile b/11.2/php8.3/fpm-bullseye/Dockerfile index 98d714022..e1b6871e7 100644 --- a/11.2/php8.3/fpm-bullseye/Dockerfile +++ b/11.2/php8.3/fpm-bullseye/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.4/apache-bookworm/Dockerfile b/11.2/php8.4/apache-bookworm/Dockerfile index f8f003771..90014f2ec 100644 --- a/11.2/php8.4/apache-bookworm/Dockerfile +++ b/11.2/php8.4/apache-bookworm/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.4/apache-bullseye/Dockerfile b/11.2/php8.4/apache-bullseye/Dockerfile index ad3122f90..b9a57bcbc 100644 --- a/11.2/php8.4/apache-bullseye/Dockerfile +++ b/11.2/php8.4/apache-bullseye/Dockerfile @@ -89,6 +89,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.4/fpm-bookworm/Dockerfile b/11.2/php8.4/fpm-bookworm/Dockerfile index d95519cd2..8fb4e92d7 100644 --- a/11.2/php8.4/fpm-bookworm/Dockerfile +++ b/11.2/php8.4/fpm-bookworm/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/11.2/php8.4/fpm-bullseye/Dockerfile b/11.2/php8.4/fpm-bullseye/Dockerfile index d92f34161..d40075cf2 100644 --- a/11.2/php8.4/fpm-bullseye/Dockerfile +++ b/11.2/php8.4/fpm-bullseye/Dockerfile @@ -82,6 +82,7 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ + composer require 'drupal/sqlite337:^1.0@alpha'; \ chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \ diff --git a/Dockerfile.template b/Dockerfile.template index a0aba0e49..0245e4f5e 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,6 +1,17 @@ {{ def is_alpine: env.variant | index("alpine") + ; + # The SQLite driver that's included in Drupal 11 core requires SQLite 3.45+. + # Alpine 3.21 is new enough + # https://pkgs.alpinelinux.org/package/v3.21/main/x86_64/sqlite-libs (3.48.0) + # Debian Bullseye and Bookworm are not new enough, but Trixie is + # https://packages.debian.org/bullseye/libsqlite3-0 (3.34.1) + # https://packages.debian.org/bookworm/libsqlite3-0 (3.40.1) + # https://packages.debian.org/trixie/libsqlite3-0 (3.46.1) + def needs_sqlite_compat: + (env.version | startswith("10.") | not) + and (env.variant | split("-")[1] | IN("bookworm", "bullseye")) -}} # https://www.drupal.org/docs/system-requirements/php-requirements FROM php:{{ env.phpVersion }}-{{ env.variant }} @@ -112,6 +123,9 @@ RUN set -eux; \ composer create-project --no-interaction "drupal/recommended-project:$DRUPAL_VERSION" ./; \ # https://github.com/docker-library/drupal/pull/266#issuecomment-2273985526 composer check-platform-reqs; \ +{{ if needs_sqlite_compat then ( -}} + composer require 'drupal/sqlite337:^1.0@alpha'; \ +{{ ) else "" end -}} chown -R www-data:www-data web/sites web/modules web/themes; \ rmdir /var/www/html; \ ln -sf /opt/drupal/web /var/www/html; \