From 6f71ebed4c4fb370f1406a9b2302965ac69c9717 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 8 Sep 2020 18:24:58 +0200
Subject: [PATCH] Fix setting of default values
---
src/Handler.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index 9b58f83..1c34d45 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -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'));
--
GitLab