Преглед изворни кода

matrix-bot-buscarron: switch to modern community.docker docker_image modules

Replaces `community.docker.docker_image` with the modern
`docker_image_pull` and `docker_image_build` split modules. Drops the
`ansible_version` compatibility ladder and the now-redundant
`_container_image_force_pull` variable (the new pull module handles
registry refresh natively via `pull: always`). Also registers
`_container_image_build_result` so that a self-build rebuild correctly
triggers a service restart.

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/5191.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
pull/4219/merge
Slavi Pantaleev пре 2 дана
родитељ
комит
19999f583d
3 измењених фајлова са 10 додато и 13 уклоњено
  1. +0
    -1
      roles/custom/matrix-bot-buscarron/defaults/main.yml
  2. +9
    -12
      roles/custom/matrix-bot-buscarron/tasks/setup_install.yml
  3. +1
    -0
      roles/custom/matrix-bot-buscarron/tasks/validate_config.yml

+ 0
- 1
roles/custom/matrix-bot-buscarron/defaults/main.yml Прегледај датотеку

@@ -40,7 +40,6 @@ matrix_bot_buscarron_container_image: "{{ matrix_bot_buscarron_container_image_r
matrix_bot_buscarron_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_buscarron_container_image_self_build else matrix_bot_buscarron_container_image_registry_prefix_upstream }}" matrix_bot_buscarron_container_image_registry_prefix: "{{ 'localhost/' if matrix_bot_buscarron_container_image_self_build else matrix_bot_buscarron_container_image_registry_prefix_upstream }}"
matrix_bot_buscarron_container_image_registry_prefix_upstream: "{{ matrix_bot_buscarron_container_image_registry_prefix_upstream_default }}" matrix_bot_buscarron_container_image_registry_prefix_upstream: "{{ matrix_bot_buscarron_container_image_registry_prefix_upstream_default }}"
matrix_bot_buscarron_container_image_registry_prefix_upstream_default: "ghcr.io/" matrix_bot_buscarron_container_image_registry_prefix_upstream_default: "ghcr.io/"
matrix_bot_buscarron_container_image_force_pull: "{{ matrix_bot_buscarron_container_image.endswith(':latest') }}"


# The base container network. It will be auto-created by this role if it doesn't exist already. # The base container network. It will be auto-created by this role if it doesn't exist already.
matrix_bot_buscarron_container_network: matrix-bot-buscarron matrix_bot_buscarron_container_network: matrix-bot-buscarron


+ 9
- 12
roles/custom/matrix-bot-buscarron/tasks/setup_install.yml Прегледај датотеку

@@ -61,11 +61,9 @@
register: matrix_bot_buscarron_support_files_result register: matrix_bot_buscarron_support_files_result


- name: Ensure Buscarron image is pulled - name: Ensure Buscarron image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_bot_buscarron_container_image }}" name: "{{ matrix_bot_buscarron_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_bot_buscarron_container_image_force_pull if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_buscarron_container_image_force_pull }}"
pull: always
when: "not matrix_bot_buscarron_container_image_self_build | bool" when: "not matrix_bot_buscarron_container_image_self_build | bool"
register: matrix_bot_buscarron_container_image_pull_result register: matrix_bot_buscarron_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}" retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -84,16 +82,14 @@
when: "matrix_bot_buscarron_container_image_self_build | bool" when: "matrix_bot_buscarron_container_image_self_build | bool"


- name: Ensure Buscarron image is built - name: Ensure Buscarron image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_bot_buscarron_container_image }}" name: "{{ matrix_bot_buscarron_container_image }}"
source: build
force_source: "{{ matrix_bot_buscarron_git_pull_results.changed if ansible_version.major > 2 or ansible_version.minor >= 8 else omit }}"
force: "{{ omit if ansible_version.major > 2 or ansible_version.minor >= 8 else matrix_bot_buscarron_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_bot_buscarron_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_bot_buscarron_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_bot_buscarron_git_pull_results.changed | bool else 'never' }}"
when: "matrix_bot_buscarron_container_image_self_build | bool" when: "matrix_bot_buscarron_container_image_self_build | bool"
register: matrix_bot_buscarron_container_image_build_result


- name: Ensure matrix-bot-buscarron.service installed - name: Ensure matrix-bot-buscarron.service installed
ansible.builtin.template: ansible.builtin.template:
@@ -110,6 +106,7 @@
or matrix_bot_buscarron_support_files_result.changed | default(false) or matrix_bot_buscarron_support_files_result.changed | default(false)
or matrix_bot_buscarron_systemd_service_result.changed | default(false) or matrix_bot_buscarron_systemd_service_result.changed | default(false)
or matrix_bot_buscarron_container_image_pull_result.changed | default(false) or matrix_bot_buscarron_container_image_pull_result.changed | default(false)
or matrix_bot_buscarron_container_image_build_result.changed | default(false)
}} }}


- name: Ensure Buscarron container network is created - name: Ensure Buscarron container network is created


+ 1
- 0
roles/custom/matrix-bot-buscarron/tasks/validate_config.yml Прегледај датотеку

@@ -19,6 +19,7 @@
- {'old': 'matrix_bot_buscarron_container_image_name_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'} - {'old': 'matrix_bot_buscarron_container_image_name_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'}
- {'old': 'matrix_bot_buscarron_docker_image', 'new': 'matrix_bot_buscarron_container_image'} - {'old': 'matrix_bot_buscarron_docker_image', 'new': 'matrix_bot_buscarron_container_image'}
- {'old': 'matrix_bot_buscarron_docker_image_force_pull', 'new': 'matrix_bot_buscarron_container_image_force_pull'} - {'old': 'matrix_bot_buscarron_docker_image_force_pull', 'new': 'matrix_bot_buscarron_container_image_force_pull'}
- {'old': 'matrix_bot_buscarron_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- {'old': 'matrix_bot_buscarron_docker_image_registry_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'} - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix', 'new': 'matrix_bot_buscarron_container_image_registry_prefix'}
- {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream'} - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream'}
- {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream_default'} - {'old': 'matrix_bot_buscarron_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bot_buscarron_container_image_registry_prefix_upstream_default'}


Loading…
Откажи
Сачувај