Add support for multiple --env-file

README.md

@@ -49,7 +49,7 @@ Skipper can serve as your primary tool for your daily development tasks:
   --build-container-image       Image to use as build container
   --build-container-tag         Tag of the build container
   --build-container-net         Network to connect the build container (default: net=host)
-  --env-file                    Environment variables file to pass to the container
+  --env-file                    Environment variables file/s to pass to the container
   --help                        Show this message and exit.
 ```
 
@@ -193,7 +193,7 @@ env:
     VAR: value
 ````
 
-You can add an environment variables file using `--env-file`.
+You can add an environment variables file (or multiple files) using `--env-file`.
 This file should use the syntax <key>=value (which sets the variable to the given value) or <key> 
 (which takes the value from the local environment), and # for comments.
 The variables defined in this file will be exported to the container.
@@ -209,7 +209,9 @@ KEY3
 
 Skipper configuration file can include the environment variables file:
 ````
-env_file: /path/to/env_file.env
+env_file: 
+    - /path/to/env_file1.env
+    - /path/to/env_file2.env
 ````
 
 

skipper/cli.py

@@ -60,7 +60,7 @@ def _validate_port_out_of_range(port):
 @click.option('--build-container-image', help='Image to use as build container')
 @click.option('--build-container-tag', help='Tag of the build container')
 @click.option('--build-container-net', help='Network to connect the build container')
-@click.option('--env-file', help='Environment variable file to load')
+@click.option('--env-file', multiple=True, help='Environment variable file(s) to load')
 @click.pass_context
 def cli(ctx, registry, build_container_image, build_container_tag, build_container_net, verbose, env_file):
     """

skipper/runner.py

@@ -17,7 +17,7 @@ def get_default_net():
 
 # pylint: disable=too-many-arguments
 def run(command, fqdn_image=None, environment=None, interactive=False, name=None, net=None, publish=(), volumes=None,
-        workdir=None, use_cache=False, workspace=None, env_file=None):
+        workdir=None, use_cache=False, workspace=None, env_file=()):
 
     if not net:
         net = get_default_net()
@@ -64,8 +64,8 @@ def _run_nested(fqdn_image, environment, command, interactive, name, net, publis
 
     cmd = handle_networking(cmd, publish, net)
 
-    if env_file:
-        cmd += ['--env-file', env_file]
+    for _file in env_file:
+        cmd += ['--env-file', _file]
 
     environment = environment or []
     for env in environment: