Merge branch 'release/6.2.0'

universityofadelaide · Jun 5, 2024 · eefa308 · eefa308
2 parents 9ae20ba + 1a221f5
commit eefa308
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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.

diff --git 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
@@ -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