Skip to content
Snippets Groups Projects
Commit 752c5ec5 authored by jurgenhaas's avatar jurgenhaas
Browse files

Set XDEBUG default to 1 in local dev mode

Also use host values for "sub"-containers in local dev mode
parent c2e42805
No related branches found
Tags v1.9.2
No related merge requests found
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"ext-json": "*", "ext-json": "*",
"php": ">=7.0", "php": ">=7.0",
"composer-plugin-api": "^1.0.0", "composer-plugin-api": "^1.0.0",
"lakedrops/composer-json-utils": "^1.3.2", "lakedrops/composer-json-utils": "^1.3.3",
"lakedrops/docker-traefik": "^1.1.3", "lakedrops/docker-traefik": "^1.1.3",
"lakedrops/dotenv": "^1.1.3", "lakedrops/dotenv": "^1.1.3",
"twig/twig": "^1.23.1" "twig/twig": "^1.23.1"
......
...@@ -240,7 +240,7 @@ class Handler extends BaseHandler { ...@@ -240,7 +240,7 @@ class Handler extends BaseHandler {
], ],
'php' => [ 'php' => [
'version' => '7.0', 'version' => '7.0',
'xdebug' => $this->isCiContext() ? 0 : 1, 'xdebug' => $this->isLocalDevMode() ? 1 : 0,
], ],
'webserver' => [ 'webserver' => [
'type' => 'apache', 'type' => 'apache',
...@@ -286,7 +286,7 @@ class Handler extends BaseHandler { ...@@ -286,7 +286,7 @@ class Handler extends BaseHandler {
], ],
], $extra['docker4drupal']); ], $extra['docker4drupal']);
if ($this->isCiContext()) { if ($this->isCiContext() || $this->isLocalDevMode()) {
$projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR')); $projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
} }
else { else {
......
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