Просмотр исходного кода

matrix-bridge-steam: 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 дней назад
Родитель
Сommit
d9bb4cbdc0
3 измененных файлов: 10 добавлений и 12 удалений
  1. +0
    -1
      roles/custom/matrix-bridge-steam/defaults/main.yml
  2. +9
    -11
      roles/custom/matrix-bridge-steam/tasks/setup_install.yml
  3. +1
    -0
      roles/custom/matrix-bridge-steam/tasks/validate_config.yml

+ 0
- 1
roles/custom/matrix-bridge-steam/defaults/main.yml Просмотреть файл

@@ -19,7 +19,6 @@ matrix_steam_bridge_container_image_registry_prefix: "{{ 'localhost/' if matrix_
matrix_steam_bridge_container_image_registry_prefix_upstream: "{{ matrix_steam_bridge_container_image_registry_prefix_upstream_default }}"
matrix_steam_bridge_container_image_registry_prefix_upstream_default: "ghcr.io/"
matrix_steam_bridge_container_image_tag: "{{ matrix_steam_bridge_version }}"
matrix_steam_bridge_container_image_force_pull: "{{ matrix_steam_bridge_container_image.endswith(':latest') }}"

matrix_steam_bridge_base_path: "{{ matrix_base_data_path }}/matrix-steam-bridge"
matrix_steam_bridge_config_path: "{{ matrix_steam_bridge_base_path }}/config"


+ 9
- 11
roles/custom/matrix-bridge-steam/tasks/setup_install.yml Просмотреть файл

@@ -8,11 +8,9 @@
matrix_steam_bridge_migration_requires_restart: false

- name: Ensure Steam bridge image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_steam_bridge_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_steam_bridge_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_steam_bridge_container_image_force_pull }}"
pull: always
when: matrix_steam_bridge_enabled | bool and not matrix_steam_bridge_container_image_self_build
register: matrix_steam_bridge_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -45,15 +43,14 @@
when: "matrix_steam_bridge_enabled | bool and matrix_steam_bridge_container_image_self_build"

- name: Ensure Steam bridge Docker image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_steam_bridge_container_image }}"
source: build
force_source: "{{ matrix_steam_bridge_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_steam_bridge_container_src_files_path }}"
pull: true
dockerfile: Dockerfile
path: "{{ matrix_steam_bridge_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_steam_bridge_git_pull_results.changed | bool else 'never' }}"
when: "matrix_steam_bridge_enabled | bool and matrix_steam_bridge_container_image_self_build | bool"
register: matrix_steam_bridge_container_image_build_result

- name: Ensure matrix-steam-bridge config.yaml installed
ansible.builtin.copy:
@@ -108,6 +105,7 @@
or matrix_steam_bridge_support_files_result.changed | default(false)
or matrix_steam_bridge_systemd_service_result.changed | default(false)
or matrix_steam_bridge_container_image_pull_result.changed | default(false)
or matrix_steam_bridge_container_image_build_result.changed | default(false)
}}

- name: Ensure matrix-steam-bridge.service restarted, if necessary


+ 1
- 0
roles/custom/matrix-bridge-steam/tasks/validate_config.yml Просмотреть файл

@@ -19,6 +19,7 @@
- {'old': 'matrix_steam_bridge_docker_image_registry_prefix_upstream_default', 'new': 'matrix_steam_bridge_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_steam_bridge_docker_image_tag', 'new': 'matrix_steam_bridge_container_image_tag'}
- {'old': 'matrix_steam_bridge_docker_src_files_path', 'new': 'matrix_steam_bridge_container_src_files_path'}
- {'old': 'matrix_steam_bridge_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

- name: Fail if required matrix_steam_bridge settings not defined
ansible.builtin.fail:


Загрузка…
Отмена
Сохранить