Add support for env variables

jolicode · Feb 22, 2014 · 9b1c684 · 9b1c684
1 parent c9b86ce
commit 9b1c684
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/resources/templates/Dockerfile-travis.twig b/resources/templates/Dockerfile-travis.twig
@@ -1,5 +1,11 @@
 {% extends "Dockerfile.twig" %}
 
+{% block env %}
+{% for key,value in env %}
+ENV {{ key }} {{ value }}
+{% endfor %}
+{% endblock %}
+
 {% block before_install %}
 RUN /bin/bash -c -l "cd $WORKDIR{% for line in before_install %} && {{ line|replace({"$": "\$", '"': '\"'}) }}{% endfor %}"
 {% endblock %}

diff --git a/resources/templates/Dockerfile.twig b/resources/templates/Dockerfile.twig
@@ -7,6 +7,9 @@ FROM jolicode/base
 
 ENV WORKDIR $HOME/project
 ADD . $WORKDIR
+WORKDIR $WORKDIR
+
+{% block env %}{% endblock %}
 
 {% block before_install %}{% endblock %}
 

diff --git a/src/Joli/JoliCi/BuildStrategy/TravisCiBuildStrategy.php b/src/Joli/JoliCi/BuildStrategy/TravisCiBuildStrategy.php
@@ -35,18 +35,21 @@ class TravisCiBuildStrategy implements BuildStrategyInterface
             'install'        => array('composer install'),
             'before_script'  => array(),
             'script'         => array('phpunit'),
+            'env'            => array()
         ),
         'ruby' => array(
             'before_install' => array(),
             'install'        => array('bundle install'),
             'before_script'  => array(),
             'script'         => array('bundle exec rake'),
+            'env'            => array()
         ),
         'node_js' => array(
             'before_install' => array(),
             'install'        => array('npm install'),
             'before_script'  => array(),
             'script'         => array('npm test'),
+            'env'            => array()
         ),
     );
 
@@ -86,13 +89,23 @@ public function createBuilds($directory)
         $versionKey = isset($this->languageVersionKeyMapping[$language]) ? $this->languageVersionKeyMapping[$language] : $language;
         $buildRoot  = $this->buildPath.DIRECTORY_SEPARATOR.uniqid();
 
+        $envFromConfig = $this->getConfigValue($config, $language, "env");
+        $envs          = array();
+
+        foreach ($envFromConfig as $env) {
+            list($key, $value) = explode("=", $env);
+            $envs[$key] = $value;
+        }
+
         foreach ($config[$versionKey] as $version) {
+
             $this->builder->setTemplateName(sprintf("%s/Dockerfile-%s.twig", $language, $version));
             $this->builder->setVariables(array(
                 'before_install' => $this->getConfigValue($config, $language, 'before_install'),
                 'install'        => $this->getConfigValue($config, $language, 'install'),
                 'before_script'  => $this->getConfigValue($config, $language, 'before_script'),
-                'script'         => $this->getConfigValue($config, $language, 'script')
+                'script'         => $this->getConfigValue($config, $language, 'script'),
+                'env'            => $envs
             ));
 
             $buildName = sprintf("%s-%s", $language, $version);