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

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

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

@@ -20,7 +20,6 @@ matrix_beeper_linkedin_version: latest

# See: https://github.com/beeper/linkedin/pkgs/container/linkedin
matrix_beeper_linkedin_container_image: "{{ matrix_beeper_linkedin_container_image_registry_prefix }}beeper/linkedin:{{ matrix_beeper_linkedin_container_image_tag }}"
matrix_beeper_linkedin_container_image_force_pull: "{{ matrix_beeper_linkedin_container_image_tag.startswith('latest') }}"
matrix_beeper_linkedin_container_image_registry_prefix: "{{ 'localhost/' if matrix_beeper_linkedin_container_image_self_build else matrix_beeper_linkedin_container_image_registry_prefix_upstream }}"
matrix_beeper_linkedin_container_image_registry_prefix_upstream: "{{ matrix_beeper_linkedin_container_image_registry_prefix_upstream_default }}"
matrix_beeper_linkedin_container_image_registry_prefix_upstream_default: "ghcr.io/"


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

@@ -44,11 +44,9 @@
register: matrix_beeper_linkedin_registration_result

- name: Ensure Beeper LinkedIn container image is pulled
community.docker.docker_image:
community.docker.docker_image_pull:
name: "{{ matrix_beeper_linkedin_container_image }}"
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
force_source: "{{ matrix_beeper_linkedin_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_beeper_linkedin_container_image_force_pull }}"
pull: always
when: "not matrix_beeper_linkedin_container_image_self_build | bool"
register: matrix_beeper_linkedin_container_image_pull_result
retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -83,17 +81,15 @@
changed_when: matrix_beeper_linkedin_generate_docker_requirements_result.rc == 0

- name: Ensure Beeper LinkedIn container image is built
community.docker.docker_image:
community.docker.docker_image_build:
name: "{{ matrix_beeper_linkedin_container_image }}"
source: build
force_source: "{{ matrix_beeper_linkedin_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_beeper_linkedin_git_pull_results.changed }}"
build:
dockerfile: Dockerfile
path: "{{ matrix_beeper_linkedin_container_src_files_path }}"
pull: true
args:
TARGETARCH: "{{ matrix_architecture }}"
dockerfile: Dockerfile
path: "{{ matrix_beeper_linkedin_container_src_files_path }}"
pull: true
rebuild: "{{ 'always' if matrix_beeper_linkedin_git_pull_results.changed | bool else 'never' }}"
args:
TARGETARCH: "{{ matrix_architecture }}"
register: matrix_beeper_linkedin_container_image_build_result

- name: Ensure beeper-linkedin container network is created
community.general.docker_network:
@@ -117,4 +113,5 @@
or matrix_beeper_linkedin_registration_result.changed | default(false)
or matrix_beeper_linkedin_systemd_service_result.changed | default(false)
or matrix_beeper_linkedin_container_image_pull_result.changed | default(false)
or matrix_beeper_linkedin_container_image_build_result.changed | default(false)
}}

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

@@ -23,6 +23,7 @@
- {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix_upstream_default'}
- {'old': 'matrix_beeper_linkedin_docker_image_tag', 'new': 'matrix_beeper_linkedin_container_image_tag'}
- {'old': 'matrix_beeper_linkedin_docker_src_files_path', 'new': 'matrix_beeper_linkedin_container_src_files_path'}
- {'old': 'matrix_beeper_linkedin_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}

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


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