summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-07-28 22:20:06 +0100
committerCarl Hetherington <cth@carlh.net>2017-07-28 22:20:06 +0100
commit53f2677bbfaa54535b5d39fc3e8a440e25769a5f (patch)
tree8ede8c76076099e6c8bd1b1deba55282c345eaa1
parent1a0bf77794fea36f42d8a0739981bab2246027fe (diff)
Try to fix upload from Docker containers via SCP.
-rwxr-xr-xcdist3
1 files changed, 2 insertions, 1 deletions
diff --git a/cdist b/cdist
index bf329a0..1301cf6 100755
--- 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):