Merge branch 'develop' into 'main'

Merging develop into main

See merge request !53

src/Handler.php

@@ -215,7 +215,6 @@ class Handler extends BaseHandler {
         $this->getDockerMountSource('/ssh-agent') :
         '$SSH_AUTH_SOCK';
     }
-    $this->config->setValue('php', $php, FALSE);
     $this->config->setValue('projectroot', $projectRoot, FALSE);
     $this->config->setValue('projectdomain', $this->config->readValue('projectname') . '.' . $traefik['domain'], FALSE);
     $this->config->setValue('projectprotocol', 'http' . ($traefik['usessl'] ? 's' : ''), FALSE);
@@ -233,8 +232,9 @@ class Handler extends BaseHandler {
     }
     $this->config->setValue('relatedprojectdomains', $relatedprojectdomains, FALSE);
     if (!empty($relatedprojectdomains)) {
-      $this->config->setValue('localip', TRUE, FALSE);
+      $php['localip'] = TRUE;
     }
+    $this->config->setValue('php', $php, FALSE);
 
     // Get ID of Docker group
     $docker_group_id = trim(shell_exec('stat -c "%g" /var/run/docker.sock'));

templates/docker-compose.yml.twig

@@ -101,7 +101,7 @@ services:
 {% if wkhtmltox.enable %}
       - './.docker-init/wkhtmltox.sh:/docker-entrypoint-init.d/50-wkhtmltox.sh'
 {% endif %}
-{% if localip %}
+{% if php.localip %}
     extra_hosts:
       - '{{ projectdomain }}:{{ docker0.ip }}'
 {% for subdomain in relatedprojectdomains %}