cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #7047 from joshuaconner/docker_bugfix_exclude_entrypoint_from_command_check

Browse source 
docker: exclude 'entrypoint' from comparing 'command' param with containers
This commit is contained in:
James Cammarata 2014-04-23 16:14:48 -05:00
commit 16874464e9
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/cloud/docker
View file

@ -489,8 +489,7 @@ class DockerManager:
return inspect return inspect
def get_deployed_containers(self): def get_deployed_containers(self):
# determine which images/commands are running already """determine which images/commands are running already"""
containers = self.client.containers(all=True)
image = self.module.params.get('image') image = self.module.params.get('image')
command = self.module.params.get('command') command = self.module.params.get('command')
if command: if command:
@ -504,13 +503,18 @@ class DockerManager:
# docker will give us back the full image name including a tag in the container list if one exists. # docker will give us back the full image name including a tag in the container list if one exists.
image, tag = self.get_split_image_tag(image) image, tag = self.get_split_image_tag(image)
for i in containers: for i in self.client.containers(all=True):
running_image, running_tag = self.get_split_image_tag(i['Image']) running_image, running_tag = self.get_split_image_tag(i['Image'])
running_command = i['Command'].strip() running_command = i['Command'].strip()
if (name and name in i['Names']) or \ name_matches = (name and name in i['Names'])
(not name and running_image == image and (not tag or tag == running_tag) and image_matches = (running_image == image)
(not command or running_command == command)): tag_matches = (not tag or running_tag == tag)
# if a container has an entrypoint, `command` will actually equal
# '{} {}'.format(entrypoint, command)
command_matches = (not command or running_command.endswith(command))
if name_matches or (image_matches and tag_matches and command_matches):
details = self.client.inspect_container(i['Id']) details = self.client.inspect_container(i['Id'])
details = _docker_id_quirk(details) details = _docker_id_quirk(details)
deployed.append(details) deployed.append(details)