From 807506b14e055eb84a6933d412290f5d328ca3cd Mon Sep 17 00:00:00 2001 From: Michael Priest Date: Wed, 3 Apr 2024 00:36:05 +1030 Subject: [PATCH 1/2] Switch to mariadb lts. --- scaffold/optional/docker-compose.linux.yml | 3 ++- scaffold/optional/docker-compose.osx.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scaffold/optional/docker-compose.linux.yml b/scaffold/optional/docker-compose.linux.yml index 26c79c5..ed331bf 100644 --- a/scaffold/optional/docker-compose.linux.yml +++ b/scaffold/optional/docker-compose.linux.yml @@ -47,12 +47,13 @@ services: extra_hosts: - host.docker.internal:host-gateway db: - image: mariadb + image: mariadb:lts environment: MYSQL_DATABASE: drupal MYSQL_USER: user MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: super-secret-password + command: --transaction-isolation=READ-COMMITTED networks: - default diff --git a/scaffold/optional/docker-compose.osx.yml b/scaffold/optional/docker-compose.osx.yml index ce1abbd..346d492 100644 --- a/scaffold/optional/docker-compose.osx.yml +++ b/scaffold/optional/docker-compose.osx.yml @@ -50,13 +50,14 @@ services: - PORT=9000 db: - image: mariadb + image: mariadb:lts network_mode: service:web environment: MYSQL_DATABASE: drupal MYSQL_USER: user MYSQL_PASSWORD: password MYSQL_ROOT_PASSWORD: super-secret-password + command: --transaction-isolation=READ-COMMITTED mail: image: axllent/mailpit From eee3aa28cc82c2366c362506d32dfd939e9cfb09 Mon Sep 17 00:00:00 2001 From: David Coote Date: Mon, 3 Jun 2024 11:45:23 +0930 Subject: [PATCH 2/2] fix ternary operator for memcache server config --- fixtures/php/settings.php.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fixtures/php/settings.php.txt b/fixtures/php/settings.php.txt index f9048b4..eff142c 100644 --- a/fixtures/php/settings.php.txt +++ b/fixtures/php/settings.php.txt @@ -43,7 +43,7 @@ if (getenv('REDIS_ENABLED')) { } } if (getenv('MEMCACHE_ENABLED')) { - $settings['memcache']['servers'] = [getenv('MEMCACHE_HOST') . ':11211' => 'default'] ?: ['127.0.0.1:11211' => 'default']; + $settings['memcache']['servers'] = getenv('MEMCACHE_HOST') ? [getenv('MEMCACHE_HOST') . ':11211' => 'default'] : ['127.0.0.1:11211' => 'default']; $settings['memcache']['bins'] = ['default' => 'default']; $settings['memcache']['key_prefix'] = ''; // If we're not installing, include the memcache services.