Some services TemplatedFiles generation bugs fixed

Ph3nol · Aug 18, 2017 · 8aabf99 · 8aabf99
1 parent 4b4a29c
commit 8aabf99
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 17 deletions.
diff --git a/dist/docker-arch.phar b/dist/docker-arch.phar
diff --git a/src/Application/Architect.php b/src/Application/Architect.php
@@ -85,26 +85,29 @@ public function generate($projectPath): void
             $project->addTemplatedFile(new TemplatedFile('docker-sync.yml', 'Base/docker-sync.yml.twig'));
         }
 
+        // Project files dump.
         foreach ($project->getTemplatedFiles() as $templatedFile) {
-            $fileContent = $this->getTemplatedFileGenerator()->render($templatedFile->getViewPath(), [
-                'project' => $project,
-            ]);
+            $fileContent = $this->getTemplatedFileGenerator()->render($templatedFile->getViewPath(), array_merge(
+                ['project' => $project],
+                $templatedFile->getParameters()
+            ));
             $this->fs->dumpFile($tmpBuildDir.'/'.$templatedFile->getRemotePath(), $fileContent);
             if ($chmod = $templatedFile->getChmod()) {
                 $this->fs->chmod($tmpBuildDir.'/'.$templatedFile->getRemotePath(), $chmod);
             }
         }
 
+        // Project services files, with dump.
         foreach ($project->getServices() as $service) {
             $serviceTmpBuildDir = sprintf('%s/%s', $tmpBuildDir, $service->getIdentifier());
 
             $service->addTemplatedFile(new TemplatedFile('Dockerfile', 'Base/Service/Dockerfile.twig'));
 
             foreach ($service->getTemplatedFiles() as $templatedFile) {
-                $fileContent = $this->getTemplatedFileGenerator()->render($templatedFile->getViewPath(), [
-                    'project' => $project,
-                    'service' => $service,
-                ]);
+                $fileContent = $this->getTemplatedFileGenerator()->render($templatedFile->getViewPath(), array_merge(
+                    ['project' => $project, 'service' => $service],
+                    $templatedFile->getParameters()
+                ));
                 $this->fs->dumpFile($serviceTmpBuildDir.'/'.$templatedFile->getRemotePath(), $fileContent);
                 if ($chmod = $templatedFile->getChmod()) {
                     $this->fs->chmod($serviceTmpBuildDir.'/'.$templatedFile->getRemotePath(), $chmod);

diff --git a/src/Application/DockerContainer/NginxDockerContainer.php b/src/Application/DockerContainer/NginxDockerContainer.php
@@ -43,9 +43,9 @@ public function init(): void
     }
 
     /**
-     * @return void
+     * @return boolean
      */
-    private function addVhostsTemplatedFiles(): void
+    private function addVhostsTemplatedFiles(): bool
     {
         $projectService = $this->getService();
 
@@ -56,9 +56,11 @@ private function addVhostsTemplatedFiles(): void
                 $vhostsServicesByHost[$service->getHost()] = $service;
             }
         }
+
+        $hasGeneratedVhosts = false;
         $vhostIndex = 0;
         foreach ($vhostsServicesByHost as $host => $service) {
-            $vhostName = $service->getType();
+            $vhostName = $service->getName();
             $appType = $service->getOptions()['appType'] ?? null;
             $templatePath = sprintf(
                 'Service/Nginx/vhosts/%s%s.conf.twig',
@@ -76,6 +78,9 @@ private function addVhostsTemplatedFiles(): void
             ]));
 
             ++$vhostIndex;
+            $hasGeneratedVhosts = true;
         }
+
+        return $hasGeneratedVhosts;
     }
 }
diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/nginx.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/nginx.conf.twig
@@ -1,5 +1,3 @@
-{% set project = generator.project %}
-{% set service = generator.service %}
 {% set host = forService.host|default('localhost') %}
 server {
     server_name {{ host }};

diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/php-symfony.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/php-symfony.conf.twig
@@ -1,5 +1,3 @@
-{% set project = generator.project %}
-{% set service = generator.service %}
 {% set host = forService.host|default('localhost') %}
 server {
     server_name {{ host }};

diff --git a/src/Application/Resources/views/Service/Nginx/vhosts/php.conf.twig b/src/Application/Resources/views/Service/Nginx/vhosts/php.conf.twig
@@ -1,5 +1,3 @@
-{% set project = generator.project %}
-{% set service = generator.service %}
 {% set host = forService.host|default('localhost') %}
 server {
     server_name {{ host }};

diff --git a/src/Domain/DockerContainer/Model/DockerContainer.php b/src/Domain/DockerContainer/Model/DockerContainer.php
@@ -38,7 +38,14 @@ public function __construct(ServiceInterface $service)
     {
         $this->service = $service;
         $this->setMaintainer('Docker Arch <https://github.com/Ph3nol/Docker-Arch>');
-        $this->init();
+        $this->addEnv('DOCKER_CONTAINER_NAME', $service->getIdentifier());
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function init(): void
+    {
     }
 
     /**

diff --git a/src/Domain/DockerContainer/Model/DockerContainerInterface.php b/src/Domain/DockerContainer/Model/DockerContainerInterface.php
@@ -7,4 +7,8 @@
  */
 interface DockerContainerInterface
 {
+    /**
+     * @return void
+     */
+    public function init(): void;
 }
diff --git a/src/Infrastructure/Common/Persistence/DataTransformer/ProjectDataTransformer.php b/src/Infrastructure/Common/Persistence/DataTransformer/ProjectDataTransformer.php
@@ -33,6 +33,11 @@ public function toModel($data, $jsonString = true): ProjectInterface
             $project->addService($service);
         }
 
+        // Project services Docker containers initialization.
+        foreach ($project->getServices() as $service) {
+            $service->getDockerContainer()->init();
+        }
+
         return $project;
     }
 }