From f5e7de06b0878d2ae854427beefdf05efdd3323d Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 21 Dec 2022 12:04:29 +0100
Subject: [PATCH] Only use local IP for PHP container, if env variable LOCAL_IP
is set to 1 or if related subdomains are defined. Setting LOCAL_IP=1 is
recommended for local dev environments and for hosts on Azure, etc.
---
src/Handler.php | 4 ++--
templates/docker-compose.yml.twig | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index dcdc10c..85ab0f4 100644
--- a/src/Handler.php
+++ b/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'));
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index 757ea48..adb958c 100644
--- a/templates/docker-compose.yml.twig
+++ b/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 %}
--
GitLab