diff options
| author | Thomas Steinbach <thomas.steinbach@aikq.de> | 2015-12-20 18:18:29 +0100 |
|---|---|---|
| committer | Toshio Kuratomi <toshio@fedoraproject.org> | 2016-03-17 14:39:44 -0700 |
| commit | 14dfad730e6356256950efbafd03e57f680499c7 (patch) | |
| tree | cb868bbb753aa6ec92b107d9107cafd7e40b8487 | |
| parent | 4ac49ed4a8535c4b4e1aab75bc0d7787be5907dd (diff) | |
| download | ansible-14dfad730e6356256950efbafd03e57f680499c7.tar.gz | |
use just 'remote_user' as user for the docker connection
| -rw-r--r-- | lib/ansible/plugins/connection/docker.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ansible/plugins/connection/docker.py b/lib/ansible/plugins/connection/docker.py index 999b94c22d..657b8b6535 100644 --- a/lib/ansible/plugins/connection/docker.py +++ b/lib/ansible/plugins/connection/docker.py @@ -121,9 +121,8 @@ class Connection(ConnectionBase): super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable) executable = C.DEFAULT_EXECUTABLE.split()[0] if C.DEFAULT_EXECUTABLE else '/bin/sh' - exec_user = self._play_context.become_user if self._play_context.become else self._play_context.remote_user # -i is needed to keep stdin open which allows pipelining to work - local_cmd = [self.docker_cmd, "exec", '-u', exec_user, '-i', self._play_context.remote_addr, executable, '-c', cmd] + local_cmd = [self.docker_cmd, "exec", '-u', self._play_context.remote_user, '-i', self._play_context.remote_addr, executable, '-c', cmd] display.vvv("EXEC %s" % (local_cmd,), host=self._play_context.remote_addr) local_cmd = [to_bytes(i, errors='strict') for i in local_cmd] @@ -170,8 +169,7 @@ class Connection(ConnectionBase): # Older docker doesn't have native support for copying files into # running containers, so we use docker exec to implement this executable = C.DEFAULT_EXECUTABLE.split()[0] if C.DEFAULT_EXECUTABLE else '/bin/sh' - exec_user = self._play_context.become_user if self._play_context.become else self._play_context.remote_user - args = [self.docker_cmd, "exec", "-u", exec_user, "-i", self._play_context.remote_addr, executable, "-c", + args = [self.docker_cmd, "exec", '-u', self._play_context.remote_user, "-i", self._play_context.remote_addr, executable, "-c", "dd of=%s bs=%s" % (out_path, BUFSIZE)] args = [to_bytes(i, errors='strict') for i in args] with open(to_bytes(in_path, errors='strict'), 'rb') as in_file: |