Rework all roles to include component_(docker|container)_image_registry_prefix* variables

This:

- brings consistency - no more mixing `_name_prefix` and `_registry_prefix`
- adds extensibility - a future patch will allow reconfiguring all registry prefixes for all roles in the playbook

We still have `_docker_` vs `_container_` inconsistencies.
These may be worked on later.
This commit is contained in:
Slavi Pantaleev
2025-02-24 07:59:37 +02:00
parent 11842116b3
commit c47eca389b
138 changed files with 610 additions and 171 deletions

View File

@ -24,11 +24,12 @@ matrix_sliding_sync_container_image_self_build_repo: https://github.com/matrix-o
matrix_sliding_sync_container_image_self_build_repo_version: "{{ 'main' if matrix_sliding_sync_version == 'main' else matrix_sliding_sync_version }}"
matrix_sliding_sync_container_src_path: "{{ matrix_sliding_sync_base_path }}/container-src"
matrix_sliding_sync_container_image: "{{ matrix_sliding_sync_container_image_name_prefix }}matrix-org/sliding-sync:{{ matrix_sliding_sync_container_image_tag }}"
matrix_sliding_sync_container_image_name_prefix: "{{ 'localhost/' if matrix_sliding_sync_container_image_self_build else matrix_sliding_sync_container_image_registry_prefix }}"
matrix_sliding_sync_container_image: "{{ matrix_sliding_sync_container_image_registry_prefix }}matrix-org/sliding-sync:{{ matrix_sliding_sync_container_image_tag }}"
matrix_sliding_sync_container_image_registry_prefix: "{{ 'localhost/' if matrix_sliding_sync_container_image_self_build else matrix_sliding_sync_container_image_registry_prefix_upstream }}"
matrix_sliding_sync_container_image_registry_prefix_upstream: "{{ matrix_sliding_sync_container_image_registry_prefix_upstream_default }}"
matrix_sliding_sync_container_image_registry_prefix_upstream_default: "ghcr.io/"
matrix_sliding_sync_container_image_tag: "{{ matrix_sliding_sync_version }}"
matrix_sliding_sync_container_image_force_pull: "{{ matrix_sliding_sync_container_image.endswith(':main') }}"
matrix_sliding_sync_container_image_registry_prefix: ghcr.io/
# The base container network. It will be auto-created by this role if it doesn't exist already.
matrix_sliding_sync_container_network: ''

View File

@ -13,3 +13,11 @@
- {'name': 'matrix_sliding_sync_container_network', when: true}
- {'name': 'matrix_sliding_sync_metrics_proxying_hostname', when: "{{ matrix_sliding_sync_metrics_proxying_enabled }}"}
- {'name': 'matrix_sliding_sync_metrics_proxying_path_prefix', when: "{{ matrix_sliding_sync_metrics_proxying_enabled }}"}
- name: (Deprecation) Catch and report renamed matrix-sliding-sync variables
ansible.builtin.fail:
msg: >-
The variable `{{ item.old }}` is deprecated. Please use `{{ item.new }}` instead.
when: "item.old in vars"
with_items:
- {'old': 'matrix_sliding_sync_container_image_name_prefix', 'new': 'matrix_sliding_sync_container_image_registry_prefix'}