Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.7] docker_container: fix support for docker-py 1.7.0 #55496

Merged
merged 2 commits into from
Apr 24, 2019
Merged

[2.7] docker_container: fix support for docker-py 1.7.0 #55496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ee86c1
In theory, some 2.7 modules support docker-py 1.7.0.
felixfontein Apr 13, 2019
2c81050
Add changelog.
felixfontein Apr 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/55496-docker_container-docker-py-1.7.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- "docker_container - make again compatible with docker-py 1.7.0."
6 changes: 4 additions & 2 deletions lib/ansible/modules/cloud/docker/docker_container.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,12 +991,14 @@ def _host_config(self):
group_add='groups',
devices='devices',
pid_mode='pid_mode',
tmpfs='tmpfs',
init='init',
uts_mode='uts',
auto_remove='auto_remove',
)

if self.client.docker_py_version >= LooseVersion('1.8'):
host_config_params['tmpfs'] = 'tmpfs'

if self.client.docker_py_version >= LooseVersion('1.9') and self.client.docker_api_version >= LooseVersion('1.22'):
# blkio_weight can always be updated, but can only be set on creation
# when docker-py and docker API are new enough
Expand Down Expand Up @@ -2260,7 +2262,7 @@ def detect_ipvX_address_usage(client):
oom_score_adj=dict(docker_api_version='1.22', docker_py_version='2.0.0'),
shm_size=dict(docker_api_version='1.22'),
stop_signal=dict(docker_api_version='1.21'),
tmpfs=dict(docker_api_version='1.22'),
tmpfs=dict(docker_api_version='1.22', docker_py_version='1.8.0'),
volume_driver=dict(docker_api_version='1.21'),
memory_reservation=dict(docker_api_version='1.21'),
kernel_memory=dict(docker_api_version='1.21'),
Expand Down
2 changes: 1 addition & 1 deletion test/integration/targets/docker_container/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
with_items: "{{ dnetworks }}"
when: docker_py_version is version('1.10.0', '>=')

when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
when: docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=')

- fail: msg="Too old docker / docker-py version to run all docker_container tests!"
when: not(docker_py_version is version('3.5.0', '>=') and docker_api_version is version('1.25', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
4 changes: 2 additions & 2 deletions test/integration/targets/docker_image/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
stop_timeout: 1
with_items: "{{ cnames }}"

when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
when: docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=')

- fail: msg="Too old docker / docker-py version to run docker_image tests!"
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
when: not(docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
4 changes: 2 additions & 2 deletions test/integration/targets/docker_image_facts/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- "'hello-world:latest' in result.images[0].RepoTags"
- "'alpine:3.8' in result.images[1].RepoTags"

when: docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')
when: docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=')

- fail: msg="Too old docker / docker-py version to run docker_image_facts tests!"
when: not(docker_py_version is version('1.8.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
when: not(docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
4 changes: 2 additions & 2 deletions test/integration/targets/docker_network/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
force: yes
loop: "{{ dnetworks }}"

when: docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=') # FIXME: find out API version!
when: docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=') # FIXME: find out API version!

- fail: msg="Too old docker / docker-py version to run docker_network tests!"
when: not(docker_py_version is version('1.10.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)
when: not(docker_py_version is version('1.7.0', '>=') and docker_api_version is version('1.20', '>=')) and (ansible_distribution != 'CentOS' or ansible_distribution_major_version|int > 6)