diff options
| author | Abdul Anshad A <abdulanshad33@gmail.com> | 2016-11-16 08:57:49 +0530 |
|---|---|---|
| committer | jctanner <tanner.jc@gmail.com> | 2016-11-15 22:27:49 -0500 |
| commit | cf76fce0ae3a01b456e2a8c5ed4dfe95d2a987da (patch) | |
| tree | 743f7ebafa8dc2bf9ac8bb036387af7bc56fff01 | |
| parent | 52d376c88e3456535e20eb45287392bef379cc70 (diff) | |
| download | ansible-modules-core-cf76fce0ae3a01b456e2a8c5ed4dfe95d2a987da.tar.gz | |
fixes issue #5517 (#5519)
| -rw-r--r-- | cloud/docker/docker_container.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cloud/docker/docker_container.py b/cloud/docker/docker_container.py index a1a595ed..4bea65b5 100644 --- a/cloud/docker/docker_container.py +++ b/cloud/docker/docker_container.py @@ -1201,6 +1201,12 @@ class Container(DockerBaseClass): # assuming if the container was running, it must have been detached. detach = not (config.get('AttachStderr') and config.get('AttachStdout')) + # "ExposedPorts": null returns None type & causes AttributeError - PR #5517 + if config.get('ExposedPorts') is not None: + expected_exposed = [re.sub(r'/.+$', '', p) for p in config.get('ExposedPorts', dict()).keys()] + else: + expected_exposed = [] + # Map parameters to container inspect results config_mapping = dict( image=config.get('Image'), @@ -1217,7 +1223,7 @@ class Container(DockerBaseClass): expected_env=(config.get('Env') or []), expected_entrypoint=config.get('Entrypoint'), expected_etc_hosts=host_config['ExtraHosts'], - expected_exposed=[re.sub(r'/.+$', '', p) for p in config.get('ExposedPorts', dict()).keys()], + expected_exposed=expected_exposed, groups=host_config.get('GroupAdd'), ipc_mode=host_config.get("IpcMode"), labels=config.get('Labels'), |