From 4155ed2518d781f18f2e3ecaf6f1f4b4b3d5b609 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 21 Jul 2022 11:23:57 +0300
Subject: [PATCH] Leave docker_image module calls unprefixed to increase
compatibility
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1965
---
roles/matrix-bot-maubot/tasks/setup_install.yml | 4 ++--
roles/matrix-bot-maubot/tasks/setup_uninstall.yml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/matrix-bot-maubot/tasks/setup_install.yml b/roles/matrix-bot-maubot/tasks/setup_install.yml
index 50e48254c..185a29889 100644
--- a/roles/matrix-bot-maubot/tasks/setup_install.yml
+++ b/roles/matrix-bot-maubot/tasks/setup_install.yml
@@ -26,7 +26,7 @@
mode: "u=rwx"
- name: Ensure maubot image is pulled
- community.docker.docker_image:
+ docker_image:
name: "{{ matrix_bot_maubot_docker_image }}"
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 }}"
@@ -49,7 +49,7 @@
when: "matrix_bot_maubot_container_image_self_build|bool"
- name: Ensure maubot image is built
- community.docker.docker_image:
+ docker_image:
name: "{{ matrix_bot_maubot_docker_image }}"
source: build
force_source: "{{ matrix_bot_maubot_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
diff --git a/roles/matrix-bot-maubot/tasks/setup_uninstall.yml b/roles/matrix-bot-maubot/tasks/setup_uninstall.yml
index 8812eeed6..0be7089ce 100644
--- a/roles/matrix-bot-maubot/tasks/setup_uninstall.yml
+++ b/roles/matrix-bot-maubot/tasks/setup_uninstall.yml
@@ -31,6 +31,6 @@
state: absent
- name: Ensure maubot Docker image doesn't exist
- community.docker.docker_image:
+ docker_image:
name: "{{ matrix_bot_maubot_docker_image }}"
state: absent