Try to fix upload from Docker containers via SCP.
authorCarl Hetherington <cth@carlh.net>
Fri, 28 Jul 2017 21:20:06 +0000 (22:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 28 Jul 2017 21:20:06 +0000 (22:20 +0100)
cdist

diff --git a/cdist b/cdist
index bf329a0cc7c9aee6774940d7057359e3408aee21..1301cf6d23229749f7a17cfeb83e98c7cd7a1253 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -520,7 +520,8 @@ class DockerTarget(LinuxTarget):
         for d in debs:
             d = d.strip()
             if len(d) > 0:
-                command('%s cp %s:/%s/%s %s' % (config.docker(), container, target, d, output_dir))
+                command('%s cp %s:/%s/%s %s' % (config.docker(), container, target, d, self.directory))
+                copyfile('%s/%s' % (self.directory, d), output_dir)
         command('%s kill %s' % (config.docker(), container))
 
 class DirectTarget(LinuxTarget):