Merge branch 'develop' into 'main'

Merging develop into main

See merge request !28

composer.json

@@ -43,8 +43,9 @@
         "composer/composer": "^1||^2",
         "drupal/coder": "^8.3",
         "lakedrops/drupal-environment": "^3.0",
-        "phpunit/phpunit": "^8.4",
-        "roave/security-advisories": "dev-latest"
+        "phpunit/phpunit": "^9.5",
+        "roave/security-advisories": "dev-master",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

src/Handler.php

@@ -64,6 +64,7 @@ class Handler extends BaseHandler {
         'cert' => $this->env->receive('traefik_cert', '', 'fullchain.pem'),
         'key' => $this->env->receive('traefik_key', '', 'privkey.pem'),
         'portainer' => $this->env->receive('traefik_portainer', '', '0'),
+        'hub_token' => $this->env->receive('traefik_hub_token', '', ''),
       ],
       'live' => [
         'root' => '',
@@ -446,6 +447,9 @@ class Handler extends BaseHandler {
     if ($this->config->readValue(['traefik', 'portainer'])) {
       $traefik->setAddonPortainer(TRUE);
     }
+    if ($hub_token = $this->config->readValue(['traefik', 'hub_token'])) {
+      $traefik->setHubToken($hub_token);
+    }
     $traefik->update();
   }
 

templates/settings.docker.php.twig

@@ -26,7 +26,7 @@ $databases = array(
       'port' => '3306',
       'prefix' => '',
       'init_commands' => [
-        'tx_level' => "SET TRANSACTION ISOLATION LEVEL READ COMMITTED;",
+        'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
       ],
     ),
   ),
@@ -50,7 +50,7 @@ $databases = array(
       'database' => 'drupal',
       'prefix' => '',
       'init_commands' => [
-        'tx_level' => "SET TRANSACTION ISOLATION LEVEL READ COMMITTED;",
+        'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
       ],
     ),
   ),