Merge pull request docker#3399 from yorkedork/fix/env-file-validation

Adds additional validation to 'env_vars_from_file'.
CuiJing · May 12, 2016 · dc88e54 · dc88e54
2 parents f1603a3 + 28fb91b
commit dc88e54
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/compose/config/environment.py b/compose/config/environment.py
@@ -28,6 +28,8 @@ def env_vars_from_file(filename):
     """
     if not os.path.exists(filename):
         raise ConfigurationError("Couldn't find env file: %s" % filename)
+    elif not os.path.isfile(filename):
+        raise ConfigurationError("%s is not a file." % (filename))
     env = {}
     for line in codecs.open(filename, 'r', 'utf-8'):
         line = line.strip()