Skip to content
Snippets Groups Projects
Commit 6de27961 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !52
parents 0a722596 149ce50b
No related branches found
No related tags found
1 merge request!52Merging develop into main
Pipeline #721688 passed
......@@ -102,6 +102,7 @@ class Handler extends BaseHandler {
'version' => $this->env->receiveGlobal('PHP_VERSION', 'PHP version', '7.4'),
'xdebug' => $this->env->receiveGlobal('PHP_DEBUG', 'PHP debug', '0'),
'coverage' => $this->env->receiveGlobal('PHP_COVERAGE', 'PHP coverage', '0'),
'localip' => $this->env->receiveGlobal('LOCAL_IP', 'Local IP', '0'),
'related_subdomains' => [],
],
'dbserver' => [
......@@ -231,6 +232,9 @@ class Handler extends BaseHandler {
$relatedprojectdomains[] = $related_subdomain . '.' . $traefik['domain'];
}
$this->config->setValue('relatedprojectdomains', $relatedprojectdomains, FALSE);
if (!empty($relatedprojectdomains)) {
$this->config->setValue('localip', TRUE, FALSE);
}
// Get ID of Docker group
$docker_group_id = trim(shell_exec('stat -c "%g" /var/run/docker.sock'));
......
......@@ -101,11 +101,13 @@ services:
{% if wkhtmltox.enable %}
- './.docker-init/wkhtmltox.sh:/docker-entrypoint-init.d/50-wkhtmltox.sh'
{% endif %}
{% if localip %}
extra_hosts:
- '{{ projectdomain }}:{{ docker0.ip }}'
{% for subdomain in relatedprojectdomains %}
- '{{ subdomain }}:{{ docker0.ip }}'
{% endfor %}
{% endif %}
{% if crontabs.enable|default(0) %}
cron:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment