ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2026-07-29 11:55:04 +00:00
Code Packages Projects Releases Wiki Activity

docker_container: fix env_file option (#452)

Browse Source 
* Add better tests for env and env_file.

* Make sure that non-container options are also passed to preprocessing code.

* Add changelog fragment.

* Add env_file override test.
This commit is contained in:
Felix Fontein
2022-08-15 07:45:59 +02:00
committed by GitHub
parent f9741b7457
commit f7cf12555c
4 changed files with 73 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/targets/docker_container/tasks/tests/options.yml
+68
View File
@@ -1589,8 +1589,16 @@
- assert:
that:
- env_1 is changed
- "'TEST1=val1' in env_1.container.Config.Env"
- "'TEST2=val2' in env_1.container.Config.Env"
- "'TEST3=False' in env_1.container.Config.Env"
- "'TEST4=true' in env_1.container.Config.Env"
- "'TEST5=yes' in env_1.container.Config.Env"
- env_2 is not changed
- env_3 is not changed
- "'TEST1=val1' in env_4.container.Config.Env"
- "'TEST2=val2' not in env_4.container.Config.Env"
- "'TEST3=val3' in env_4.container.Config.Env"
- env_4 is changed
- env_5 is failed
- "('Non-string value found for env option.') in env_5.msg"
@@ -1622,6 +1630,54 @@
env_file: "{{ remote_tmp_dir }}/env-file"
register: env_file_2
- name: env_file (with env, idempotent)
docker_container:
image: "{{ docker_test_image_alpine }}"
command: '/bin/sh -c "sleep 10m"'
name: "{{ cname }}"
state: started
env_file: "{{ remote_tmp_dir }}/env-file"
env:
TEST3: val3
register: env_file_3
- name: env_file (with env)
docker_container:
image: "{{ docker_test_image_alpine }}"
command: '/bin/sh -c "sleep 10m"'
name: "{{ cname }}"
state: started
env_file: "{{ remote_tmp_dir }}/env-file"
env:
TEST1: val1
TEST3: val3
force_kill: yes
register: env_file_4
- name: env_file (with env, idempotent)
docker_container:
image: "{{ docker_test_image_alpine }}"
command: '/bin/sh -c "sleep 10m"'
name: "{{ cname }}"
state: started
env_file: "{{ remote_tmp_dir }}/env-file"
env:
TEST1: val1
register: env_file_5
- name: env_file (with env, override)
docker_container:
image: "{{ docker_test_image_alpine }}"
command: '/bin/sh -c "sleep 10m"'
name: "{{ cname }}"
state: started
env_file: "{{ remote_tmp_dir }}/env-file"
env:
TEST2: val2
TEST4: val4alt
force_kill: yes
register: env_file_6
- name: cleanup
docker_container:
name: "{{ cname }}"
@@ -1632,7 +1688,19 @@
- assert:
that:
- env_file_1 is changed
- "'TEST3=val3' in env_file_1.container.Config.Env"
- "'TEST4=val4' in env_file_1.container.Config.Env"
- env_file_2 is not changed
- env_file_3 is not changed
- env_file_4 is changed
- "'TEST1=val1' in env_file_4.container.Config.Env"
- "'TEST3=val3' in env_file_4.container.Config.Env"
- "'TEST4=val4' in env_file_4.container.Config.Env"
- env_file_5 is not changed
- env_file_6 is changed
- "'TEST2=val2' in env_file_6.container.Config.Env"
- "'TEST3=val3' in env_file_6.container.Config.Env"
- "'TEST4=val4alt' in env_file_6.container.Config.Env"
####################################################################
## etc_hosts #######################################################