cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Expect module env vars to override Dockerfile ones.

Browse source
This commit is contained in:
Ash Wilson 2015-03-09 12:17:39 -04:00 committed by Matt Clay
parent 4e7d766e8f
commit ff0d0ceb70
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/cloud/docker/docker.py
View file

@ -846,11 +846,20 @@ class DockerManager(object):
# actual_env is likely to include environment variables injected by # actual_env is likely to include environment variables injected by
# the Dockerfile. # the Dockerfile.
expected_env = set(image['ContainerConfig']['Env'] or []) expected_env = {}
for image_env in image['ContainerConfig']['Env'] or []:
name, value = image_env.split('=', 1)
expected_env[name] = value
if self.env: if self.env:
for name, value in self.env.iteritems(): for name, value in self.env.iteritems():
expected_env.add("{}={}".format(name, value)) expected_env[name] = value
actual_env = set(container['Config']['Env'] or [])
actual_env = {}
for container_env in container['Config']['Env'] or []:
name, value = container_env.split('=', 1)
actual_env[name] = value
if actual_env != expected_env: if actual_env != expected_env:
# Don't include the environment difference in the output. # Don't include the environment difference in the output.