Merge pull request #7419 from mattjbray/docker-fix-selection-by-name

docker: fix targetting images by name
This commit is contained in:
James Cammarata 2014-05-15 09:55:46 -05:00
commit 2e8c940566

View file

@ -516,7 +516,7 @@ class DockerManager:
# '{} {}'.format(entrypoint, command) # '{} {}'.format(entrypoint, command)
command_matches = (not command or running_command.endswith(command)) command_matches = (not command or running_command.endswith(command))
if name_matches or (image_matches and tag_matches and command_matches): if name_matches or (name is None and 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)