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

Fix setting of default values

parent dc65ff5b
Branches
Tags
No related merge requests found
......@@ -227,7 +227,7 @@ class Handler extends BaseHandler {
$env->put('COMPOSE_PROJECT_NAME', $projectname);
}
$extra = $this->composer->getPackage()->getExtra() + ['docker4drupal' => []];
$options = NestedArray::mergeDeep([
$options = NestedArray::mergeDeep($extra['docker4drupal'], [
'projectname' => $projectname,
'ci_home' => '/home/gitlab-runner',
'docker0' => [
......@@ -309,7 +309,7 @@ class Handler extends BaseHandler {
'wkhtmltox' => [
'enable' => 0,
],
], $extra['docker4drupal']);
]);
if ($this->isCiContext() || $this->isLocalDevMode()) {
$projectRoot = $this->getDockerMountSource(getenv('CI_PROJECT_DIR'));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment