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 #31357 from ticosax/support-docker-inconsistencies

Browse source 
[dockerng] Support docker inconsistencies
This commit is contained in:
Nicole Thomas 2016-02-19 13:02:08 -07:00
commit 7e599f0e27
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/states/dockerng.py
View file

@ -183,6 +183,8 @@ def _compare(actual, create_kwargs, defaults_from_image):
continue
elif item == 'environment':
if actual_data is None:
actual_data = []
actual_env = {}
for env_var in actual_data:
try: