Merge pull request #18 from anivon/master

Remove env vars prefix
Ph3nol · Oct 3, 2017 · bddb991 · bddb991
2 parents 5afa191 + 07d9fd2
commit bddb991
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/src/Application/DockerContainer/ElasticsearchDockerContainer.php b/src/Application/DockerContainer/ElasticsearchDockerContainer.php
@@ -60,7 +60,7 @@ public function execute(): void
         // Volumes.
         $this
             ->addVolume([
-                'local' => '${'.$project->generateEnvKey('ELASTIC_SEARCH_DATA_LOCATION').'}',
+                'local' => '${ELASTIC_SEARCH_DATA_LOCATION}',
                 'remote' => '/usr/share/elasticsearch/data',
                 'type' => 'rw',
             ]);

diff --git a/src/Application/DockerContainer/MysqlDockerContainer.php b/src/Application/DockerContainer/MysqlDockerContainer.php
@@ -39,7 +39,7 @@ public function execute(): void
         // Volumes.
         $this
             ->addVolume([
-                'local' => '${'.$project->generateEnvKey('MYSQL_DATA_LOCATION').'}',
+                'local' => '${MYSQL_DATA_LOCATION}',
                 'remote' => '/var/lib/mysql',
                 'type' => 'rw',
             ]);

diff --git a/src/Application/DockerContainer/NginxDockerContainer.php b/src/Application/DockerContainer/NginxDockerContainer.php
@@ -58,7 +58,7 @@ public function execute(): void
         $project->addEnv('NGINX_LOGS_LOCATION', Architect::GLOBAL_ABSOLUTE_TMP_DIRECTORY.'/logs/nginx');
         $this
             ->addVolume([
-                'local' => '${'.$project->generateEnvKey('NGINX_LOGS_LOCATION').'}',
+                'local' => '${NGINX_LOGS_LOCATION}',
                 'remote' => '/var/log/nginx',
                 'type' => 'rw',
             ]);

diff --git a/src/Domain/DockerContainer/Model/DockerContainer.php b/src/Domain/DockerContainer/Model/DockerContainer.php
@@ -171,7 +171,7 @@ public function setPackageManager(string $packageManager): self
      */
     public function addEnvFromProject(string $key): self
     {
-        $this->envs[$key] = '${'.$this->getService()->getProject()->generateEnvKey($key).'}';
+        $this->envs[$key] = '${' . key . '}';
 
         return $this;
     }
@@ -189,7 +189,7 @@ public function addEnvPort(string $envProperty, array $port): array
 
         $portKey = $service->generateEnvKey($envProperty.'_PORT');
         $project->addEnv($portKey, $port['from']);
-        $port['from'] = '${'.$project->generateEnvKey($portKey).'}';
+        $port['from'] = '${' . $portKey . '}';
         $this->addPort($port);
 
         return $port;

diff --git a/src/Domain/Project/Model/Project.php b/src/Domain/Project/Model/Project.php
@@ -13,8 +13,6 @@
  */
 class Project implements ProjectInterface
 {
-    const DOCKER_ENV_CONFIGURATION_PREFIX = 'DOCKER_CONFIG_';
-
     use TemplatedFilesPropertyTrait;
     use DockerContainerEnvsTrait;
 
@@ -228,22 +226,12 @@ public function getLabel(): string
         return $this->label;
     }
 
-    /**
-     * @param string $key
-     *
-     * @return string
-     */
-    public function generateEnvKey(string $key): string
-    {
-        return self::DOCKER_ENV_CONFIGURATION_PREFIX.$key;
-    }
-
     /**
      * {@inheritdoc}
      */
     public function addEnv(string $key, string $value): self
     {
-        $this->envs[$this->generateEnvKey($key)] = $value;
+        $this->envs[$key] = $value;
 
         return $this;
     }