afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

changes to allow node container commands to leverage shell parameter when needed

Browse source
This commit is contained in:
Blake Harnden 2019-12-20 09:57:34 -08:00
parent e92441d728
commit 95c57bbad6
4 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/nodes/docker.py
View file

@ -43,9 +43,9 @@ class DockerClient:
def stop_container(self):
self.run(f"docker rm -f {self.name}")
def check_cmd(self, cmd):
def check_cmd(self, cmd, wait=True, shell=False):
logging.info("docker cmd output: %s", cmd)
return utils.cmd(f"docker exec {self.name} {cmd}")
return utils.cmd(f"docker exec {self.name} {cmd}", wait=wait, shell=shell)
def create_ns_cmd(self, cmd):
return f"nsenter -t {self.pid} -u -i -p -n {cmd}"
@ -148,10 +148,10 @@ class DockerNode(CoreNode):
self.client.stop_container()
self.up = False
def nsenter_cmd(self, args, wait=True):
def nsenter_cmd(self, args, wait=True, shell=False):
if self.server is None:
args = self.client.create_ns_cmd(args)
return utils.cmd(args, wait=wait)
return utils.cmd(args, wait=wait, shell=shell)
else:
args = self.client.create_ns_cmd(args)
return self.server.remote_cmd(args, wait=wait)