summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-08-05 23:56:08 +0100
committerCarl Hetherington <cth@carlh.net>2017-08-05 23:56:08 +0100
commita6e447e71afd73b6f6c4822a9ee0b961a219cc2a (patch)
tree87e1e5a44e0147605219fedab61e7a8b51cf81ba
parentf6213bb8de2fa84def82902aeb889fd0796b989d (diff)
parente06742ba095285493f2120b99b67f4dbbc447b5d (diff)
Merge branch 'docker2' of git.carlh.net:git/cdist into docker2
-rwxr-xr-xcdist3
1 files changed, 3 insertions, 0 deletions
diff --git a/cdist b/cdist
index dc9eec3..fa68abe 100755
--- a/cdist
+++ b/cdist
@@ -523,6 +523,9 @@ class DockerTarget(LinuxTarget):
copyfile('%s/%s' % (self.directory, d), output_dir)
command('%s kill %s' % (config.docker(), container))
+ def command(self, cmd):
+ command('%s exec -t %s /bin/bash -c "%s"' % (config.docker(), container, cmd))
+
class DirectTarget(LinuxTarget):
"""Build directly in the current environment"""
def __init__(self, distro, version, bits, directory=None):