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:
@ -14,8 +14,10 @@ matrix_appservice_webhooks_container_image_self_build_repo_version: "{{ 'master'
|
||||
matrix_appservice_webhooks_container_image_self_build_repo_dockerfile_path: "Dockerfile"
|
||||
|
||||
matrix_appservice_webhooks_version: v1.0.3-01
|
||||
matrix_appservice_webhooks_docker_image: "{{ matrix_appservice_webhooks_docker_image_name_prefix }}redoonetworks/matrix-appservice-webhooks:{{ matrix_appservice_webhooks_version }}"
|
||||
matrix_appservice_webhooks_docker_image_name_prefix: "{{ 'localhost/' if matrix_appservice_webhooks_container_image_self_build else 'docker.io/' }}"
|
||||
matrix_appservice_webhooks_docker_image: "{{ matrix_appservice_webhooks_docker_image_registry_prefix }}redoonetworks/matrix-appservice-webhooks:{{ matrix_appservice_webhooks_version }}"
|
||||
matrix_appservice_webhooks_docker_image_registry_prefix: "{{ 'localhost/' if matrix_appservice_webhooks_container_image_self_build else matrix_appservice_webhooks_docker_image_registry_prefix_upstream }}"
|
||||
matrix_appservice_webhooks_docker_image_registry_prefix_upstream: "{{ matrix_appservice_webhooks_docker_image_registry_prefix_upstream_default }}"
|
||||
matrix_appservice_webhooks_docker_image_registry_prefix_upstream_default: "docker.io/"
|
||||
matrix_appservice_webhooks_docker_image_force_pull: "{{ matrix_appservice_webhooks_docker_image.endswith(':latest') }}"
|
||||
|
||||
matrix_appservice_webhooks_base_path: "{{ matrix_base_data_path }}/appservice-webhooks"
|
||||
|
@ -14,3 +14,12 @@
|
||||
- matrix_appservice_webhooks_container_network
|
||||
- matrix_appservice_webhooks_hostname
|
||||
- matrix_appservice_webhooks_path_prefix
|
||||
|
||||
- name: (Deprecation) Catch and report renamed appservice-webhooks variables
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Your configuration contains a variable, which now has a different name.
|
||||
Please change your configuration to rename the variable (`{{ item.old }}` -> `{{ item.new }}`).
|
||||
when: "item.old in vars"
|
||||
with_items:
|
||||
- {'old': 'matrix_appservice_webhooks_docker_image_name_prefix', 'new': 'matrix_appservice_webhooks_docker_image_registry_prefix'}
|
||||
|
Reference in New Issue
Block a user