saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #47672 from terminalmage/bp-47487

Browse source 
Backport #47487 to 2018.3
This commit is contained in:
Nicole Thomas 2018-05-16 09:55:39 -04:00 • committed by GitHub
commit d17a16b648
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/states/docker_image.py
View file

@ -349,9 +349,10 @@ def present(name,
# Only add to the changes dict if layers were pulled
ret['changes'] = image_update
error = False
try:
__salt__['docker.inspect_image'](full_image)
error = False
except CommandExecutionError as exc:
msg = exc.__str__()
if '404' not in msg: