Merge pull request #2853 from Igelko/patch-1

docker: If cmd and entrypoint not set, don't match them
reviewable/pr18780/r1
Brian Coca 9 years ago
commit dabf28edbe

@ -1544,7 +1544,14 @@ class DockerManager(object):
image_matches = running_image in repo_tags image_matches = running_image in repo_tags
command_matches = command == details['Config']['Cmd'] if command == None:
command_matches = True
else:
command_matches = (command == details['Config']['Cmd'])
if entrypoint == None:
entrypoint_matches = True
else:
entrypoint_matches = ( entrypoint_matches = (
entrypoint == details['Config']['Entrypoint'] entrypoint == details['Config']['Entrypoint']
) )

Loading…
Cancel
Save