From 01df810b5b516758bf05e7b0d1e5c4ace20d60c1 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 3 Apr 2017 18:16:42 +0200
Subject: [PATCH] Make webRoot dynamic
---
src/Handler.php | 3 ++-
templates/docker-compose.yml.twig | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Handler.php b/src/Handler.php
index 431dc66..655d164 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -109,9 +109,10 @@ class Handler {
$settingsPath = 'settings/default';
}
- // Link Drupal site's settings files
+ // Provide all the requiired files
$twig_loader = new \Twig_Loader_Array([]);
$twig = new \Twig_Environment($twig_loader);
+ $options['webRoot'] = $webRoot . '/';
foreach ($this->getFiles($projectRoot, $webRoot, $settingsPath) as $template => $def) {
$file = $def['dest'] . '/' . $template;
if (!$fs->exists($file)) {
diff --git a/templates/docker-compose.yml.twig b/templates/docker-compose.yml.twig
index 28249ab..7c5d021 100644
--- a/templates/docker-compose.yml.twig
+++ b/templates/docker-compose.yml.twig
@@ -29,7 +29,7 @@ services:
- php
environment:
NGINX_BACKEND_HOST: php
- NGINX_SERVER_ROOT: /var/www/html/web/
+ NGINX_SERVER_ROOT: /var/www/html/{{ webRoot }}
volumes:
- ./:/var/www/html
labels:
--
GitLab