finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Leave docker_image module calls unprefixed to increase compatibility

Browse Source 
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1965
This commit is contained in:
Slavi Pantaleev 2022-07-21 11:23:57 +03:00
parent b9d7e24859
commit 4155ed2518
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/matrix-bot-maubot/tasks/setup_install.yml
View File

@ -26,7 +26,7 @@
mode: "u=rwx" mode: "u=rwx"
- name: Ensure maubot image is pulled - name: Ensure maubot image is pulled
community.docker.docker_image: docker_image:
name: "{{ matrix_bot_maubot_docker_image }}" name: "{{ matrix_bot_maubot_docker_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}" source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_bot_maubot_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" force_source: "{{ matrix_bot_maubot_docker_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
@ -49,7 +49,7 @@
when: "matrix_bot_maubot_container_image_self_build|bool" when: "matrix_bot_maubot_container_image_self_build|bool"
- name: Ensure maubot image is built - name: Ensure maubot image is built
community.docker.docker_image: docker_image:
name: "{{ matrix_bot_maubot_docker_image }}" name: "{{ matrix_bot_maubot_docker_image }}"
source: build source: build
force_source: "{{ matrix_bot_maubot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}" force_source: "{{ matrix_bot_maubot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"

2
roles/matrix-bot-maubot/tasks/setup_uninstall.yml
View File

@ -31,6 +31,6 @@
state: absent state: absent
- name: Ensure maubot Docker image doesn't exist - name: Ensure maubot Docker image doesn't exist
community.docker.docker_image: docker_image:
name: "{{ matrix_bot_maubot_docker_image }}" name: "{{ matrix_bot_maubot_docker_image }}"
state: absent state: absent