Allow for ${PWD} in settings.volumes (#664)

ansible · Jul 24, 2017 · 8329951 · 8329951
1 parent 89a5296
commit 8329951
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -18,6 +18,7 @@ Tomas Tomecek <ttomecek@redhat.com>
 Fabian von Feilitzsch <fabianvf@users.noreply.github.com>
 Charlie Drage <charlie@charliedrage.com>
 Roderick Randolph <roderickrandolph@users.noreply.github.com>
+Marcus Levine <marcusianl@gmail.com>
 Will Refvem <wbrefvem@gmail.com>
 Sebastien Plisson <sebastien.plisson@gmail.com>
 Mike Hume <mhumeSF@gmail.com>

diff --git a/container/docker/engine.py b/container/docker/engine.py
@@ -245,7 +245,7 @@ def run_conductor(self, command, config, base_path, params, engine_name=None, vo
 
         def _add_volume(vol):
             volume_parts = vol.split(':')
-            volume_parts[0] = os.path.normpath(os.path.abspath(os.path.expanduser(volume_parts[0])))
+            volume_parts[0] = os.path.normpath(os.path.abspath(os.path.expanduser(os.path.expandvars(volume_parts[0]))))
             volumes[volume_parts[0]] = {
                 'bind': volume_parts[1] if len(volume_parts) > 1 else volume_parts[0],
                 'mode': volume_parts[2] if len(volume_parts) > 2 else 'rw'