Skip to content
Snippets Groups Projects

Merging develop into main

Merged jurgenhaas requested to merge develop into main
2 files
+ 3
3
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 2
2
@@ -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'));
Loading