summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-10-04 00:01:36 +0200
committerCarl Hetherington <cth@carlh.net>2019-10-04 00:01:36 +0200
commitbb38d4d224f4e180f2f2bc56d9f93033ab7afbb8 (patch)
tree42e83abc68ca7cc18e3a1e677437843b5e29c997
parenteed00406405713dfad0186e8c9b9fe2585377d40 (diff)
Config option to not specify a user when calling docker.
-rwxr-xr-xcdist7
1 files changed, 6 insertions, 1 deletions
diff --git a/cdist b/cdist
index bf478d2..751be98 100755
--- a/cdist
+++ b/cdist
@@ -106,6 +106,7 @@ class Config:
Option('osx_sdk_prefix'),
Option('osx_sdk'),
BoolOption('docker_sudo'),
+ BoolOption('docker_no_user'),
Option('docker_hub_repository'),
Option('flatpak_state_dir'),
Option('parallel', 4) ]
@@ -531,7 +532,11 @@ class DockerTarget(Target):
def command(self, cmd):
dir = os.path.join(self.directory, os.path.relpath(os.getcwd(), self.directory))
- command('%s exec -u %s -t %s /bin/bash -c \'export %s; cd %s; %s\'' % (config.docker(), getpass.getuser(), self.container, self.variables_string(), dir, cmd))
+ if config.get('docker_no_user'):
+ user = ''
+ else:
+ user = '-t %s' % getpass.getuser()
+ command('%s exec -u %s %s /bin/bash -c \'export %s; cd %s; %s\'' % (config.docker(), user, self.container, self.variables_string(), dir, cmd))
def cleanup(self):
super(DockerTarget, self).cleanup()