mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2026-03-01 10:23:08 +00:00
Rename _docker_ vars to _container_ across 34 roles
Roles affected: appservice-discord, appservice-irc, beeper-linkedin, heisenbridge, hookshot, mautrix-bluesky, mautrix-discord, mautrix-gmessages, mautrix-googlechat, mautrix-signal, mautrix-slack, mautrix-twitter, mautrix-whatsapp, mautrix-wsproxy, mx-puppet-groupme, mx-puppet-steam, postmoogle, sms, steam, cactus-comments, element, fluffychat, schildichat, conduit, corporal, dendrite, ldap-registration-proxy, media-repo, pantalaimon, prometheus-nginxlog-exporter, registration, sygnal, synapse-admin, user-verification-service. For each role: renamed _docker_image* variables to _container_image* (and _docker_src_files_path to _container_src_files_path where applicable), added deprecation entries in validate_config.yml, and updated group_vars/docs references. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Slavi Pantaleev
@@ -23,19 +23,19 @@ matrix_media_repo_identifier: matrix-media-repo
|
||||
matrix_media_repo_container_image_self_build: false
|
||||
matrix_media_repo_container_image_self_build_repo: "https://github.com/turt2live/matrix-media-repo.git"
|
||||
|
||||
matrix_media_repo_docker_image_path: "t2bot/matrix-media-repo"
|
||||
matrix_media_repo_docker_image: "{{ matrix_media_repo_docker_image_registry_prefix }}{{ matrix_media_repo_docker_image_path }}:{{ matrix_media_repo_docker_image_tag }}"
|
||||
matrix_media_repo_docker_image_registry_prefix: "{{ 'localhost/' if matrix_media_repo_container_image_self_build else matrix_media_repo_docker_image_registry_prefix_upstream }}"
|
||||
matrix_media_repo_docker_image_registry_prefix_upstream: "{{ matrix_media_repo_docker_image_registry_prefix_upstream_default }}"
|
||||
matrix_media_repo_docker_image_registry_prefix_upstream_default: "ghcr.io/"
|
||||
matrix_media_repo_container_image_path: "t2bot/matrix-media-repo"
|
||||
matrix_media_repo_container_image: "{{ matrix_media_repo_container_image_registry_prefix }}{{ matrix_media_repo_container_image_path }}:{{ matrix_media_repo_container_image_tag }}"
|
||||
matrix_media_repo_container_image_registry_prefix: "{{ 'localhost/' if matrix_media_repo_container_image_self_build else matrix_media_repo_container_image_registry_prefix_upstream }}"
|
||||
matrix_media_repo_container_image_registry_prefix_upstream: "{{ matrix_media_repo_container_image_registry_prefix_upstream_default }}"
|
||||
matrix_media_repo_container_image_registry_prefix_upstream_default: "ghcr.io/"
|
||||
# renovate: datasource=docker depName=ghcr.io/t2bot/matrix-media-repo
|
||||
matrix_media_repo_docker_image_tag: "v1.3.8"
|
||||
matrix_media_repo_docker_image_force_pull: "{{ matrix_media_repo_docker_image.endswith(':latest') }}"
|
||||
matrix_media_repo_container_image_tag: "v1.3.8"
|
||||
matrix_media_repo_container_image_force_pull: "{{ matrix_media_repo_container_image.endswith(':latest') }}"
|
||||
|
||||
matrix_media_repo_base_path: "{{ matrix_base_data_path }}/{{ matrix_media_repo_identifier }}"
|
||||
matrix_media_repo_config_path: "{{ matrix_media_repo_base_path }}/config"
|
||||
matrix_media_repo_data_path: "{{ matrix_media_repo_base_path }}/data"
|
||||
matrix_media_repo_docker_src_files_path: "{{ matrix_media_repo_base_path }}/docker-src"
|
||||
matrix_media_repo_container_src_files_path: "{{ matrix_media_repo_base_path }}/docker-src"
|
||||
|
||||
# List of systemd services that matrix-media-repo.service depends on
|
||||
matrix_media_repo_systemd_required_services_list: "{{ matrix_media_repo_systemd_required_services_list_default + matrix_media_repo_systemd_required_services_list_auto + matrix_media_repo_systemd_required_services_list_custom }}"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
when: true
|
||||
- path: "{{ matrix_media_repo_data_path }}"
|
||||
when: true
|
||||
- path: "{{ matrix_media_repo_docker_src_files_path }}"
|
||||
- path: "{{ matrix_media_repo_container_src_files_path }}"
|
||||
when: "{{ matrix_media_repo_container_image_self_build }}"
|
||||
when: "item.when | bool"
|
||||
|
||||
@@ -46,10 +46,10 @@
|
||||
|
||||
- name: Ensure media-repo Docker image is pulled
|
||||
community.docker.docker_image:
|
||||
name: "{{ matrix_media_repo_docker_image }}"
|
||||
name: "{{ matrix_media_repo_container_image }}"
|
||||
source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
|
||||
force_source: "{{ matrix_media_repo_docker_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_media_repo_docker_image_force_pull }}"
|
||||
force_source: "{{ matrix_media_repo_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_media_repo_container_image_force_pull }}"
|
||||
when: "not matrix_media_repo_container_image_self_build | bool"
|
||||
register: result
|
||||
retries: "{{ devture_playbook_help_container_retries_count }}"
|
||||
@@ -61,16 +61,16 @@
|
||||
- name: Ensure media-repo repository is present on self-build
|
||||
ansible.builtin.git:
|
||||
repo: "{{ matrix_media_repo_container_image_self_build_repo }}"
|
||||
dest: "{{ matrix_media_repo_docker_src_files_path }}"
|
||||
version: "{{ matrix_media_repo_docker_image.split(':')[1] }}"
|
||||
dest: "{{ matrix_media_repo_container_src_files_path }}"
|
||||
version: "{{ matrix_media_repo_container_image.split(':')[1] }}"
|
||||
force: "yes"
|
||||
become: true
|
||||
become_user: "{{ matrix_user_name }}"
|
||||
register: matrix_media_repo_git_pull_results
|
||||
|
||||
- name: Check if media-repo Docker image exists
|
||||
ansible.builtin.command: "{{ devture_systemd_docker_base_host_command_docker }} images --quiet --filter 'reference={{ matrix_media_repo_docker_image }}'"
|
||||
register: matrix_media_repo_docker_image_check_result
|
||||
ansible.builtin.command: "{{ devture_systemd_docker_base_host_command_docker }} images --quiet --filter 'reference={{ matrix_media_repo_container_image }}'"
|
||||
register: matrix_media_repo_container_image_check_result
|
||||
changed_when: false
|
||||
|
||||
# Invoking the `docker build` command here, instead of calling the `docker_image` Ansible module,
|
||||
@@ -78,11 +78,11 @@
|
||||
# See: https://github.com/ansible-collections/community.general/issues/514
|
||||
- name: Ensure media-repo Docker image is built
|
||||
ansible.builtin.command:
|
||||
cmd: "{{ devture_systemd_docker_base_host_command_docker }} build -t {{ matrix_media_repo_docker_image }} {{ matrix_media_repo_docker_src_files_path }}"
|
||||
cmd: "{{ devture_systemd_docker_base_host_command_docker }} build -t {{ matrix_media_repo_container_image }} {{ matrix_media_repo_container_src_files_path }}"
|
||||
environment:
|
||||
DOCKER_BUILDKIT: 1
|
||||
changed_when: true
|
||||
when: "matrix_media_repo_git_pull_results.changed | bool or matrix_media_repo_docker_image_check_result.stdout == ''"
|
||||
when: "matrix_media_repo_git_pull_results.changed | bool or matrix_media_repo_container_image_check_result.stdout == ''"
|
||||
|
||||
- name: Check existence of media-repo signing key
|
||||
ansible.builtin.stat:
|
||||
@@ -102,7 +102,7 @@
|
||||
--mount type=bind,src={{ matrix_media_repo_config_path }},dst=/config
|
||||
--workdir='/config'
|
||||
--entrypoint='generate_signing_key'
|
||||
{{ matrix_media_repo_docker_image }}
|
||||
{{ matrix_media_repo_container_image }}
|
||||
-output {{ matrix_media_repo_identifier }}.signing.key.TEMP
|
||||
creates: "{{ matrix_media_repo_config_path }}/{{ matrix_media_repo_identifier }}.signing.key.TEMP"
|
||||
|
||||
@@ -118,7 +118,7 @@
|
||||
--mount type=bind,src={{ matrix_media_repo_homeserver_signing_key | dirname }},dst=/homeserver-signing-key-dir
|
||||
--workdir='/config'
|
||||
--entrypoint='combine_signing_keys'
|
||||
{{ matrix_media_repo_docker_image }}
|
||||
{{ matrix_media_repo_container_image }}
|
||||
-format {{ matrix_homeserver_implementation }} -output /homeserver-signing-key-dir/{{ matrix_media_repo_homeserver_signing_key | basename }}.merged /homeserver-signing-key-dir/{{ matrix_media_repo_homeserver_signing_key | basename }} {{ matrix_media_repo_identifier }}.signing.key.TEMP
|
||||
creates: "{{ matrix_media_repo_homeserver_signing_key }}.merged"
|
||||
|
||||
|
||||
@@ -6,18 +6,6 @@
|
||||
|
||||
---
|
||||
|
||||
- name: Fail if required matrix-media-repo settings not defined
|
||||
ansible.builtin.fail:
|
||||
msg: >
|
||||
You need to define a required configuration setting (`{{ item.name }}`).
|
||||
when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
|
||||
with_items:
|
||||
- {'name': 'matrix_media_repo_database_hostname', when: true}
|
||||
- {'name': 'matrix_media_repo_container_labels_traefik_internal_media_entrypoints', when: "{{ matrix_media_repo_container_labels_traefik_internal_media_enabled }}"}
|
||||
- {'name': 'matrix_media_repo_container_labels_traefik_internal_matrix_client_media_entrypoints', when: "{{ matrix_media_repo_container_labels_traefik_internal_matrix_client_media_enabled }}"}
|
||||
- {'name': 'matrix_media_repo_datastore_file_id', when: "{{ (matrix_media_repo_datastore_file_for_kinds | length) > 0 }}"}
|
||||
- {'name': 'matrix_media_repo_datastore_s3_id', when: "{{ (matrix_media_repo_datastore_s3_for_kinds | length) > 0 }}"}
|
||||
|
||||
- name: (Deprecation) Catch and report renamed matrix-media-repo settings
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
@@ -42,4 +30,24 @@
|
||||
- {'old': 'matrix_media_repo_container_labels_traefik_admin_path_prefix', 'new': 'matrix_media_repo_container_labels_traefik_admin_path_regexp'}
|
||||
- {'old': 'matrix_media_repo_container_labels_traefik_logout_federation_path_prefix', 'new': 'matrix_media_repo_container_labels_traefik_logout_federation_path_regexp'}
|
||||
- {'old': 'matrix_media_repo_container_labels_traefik_admin_federation_path_prefix', 'new': 'matrix_media_repo_container_labels_traefik_admin_federation_path_regexp'}
|
||||
- {'old': 'matrix_media_repo_docker_image_name_prefix', 'new': 'matrix_media_repo_docker_image_registry_prefix'}
|
||||
- {'old': 'matrix_media_repo_docker_image_name_prefix', 'new': 'matrix_media_repo_container_image_registry_prefix'}
|
||||
- {'old': 'matrix_media_repo_docker_image', 'new': 'matrix_media_repo_container_image'}
|
||||
- {'old': 'matrix_media_repo_docker_image_force_pull', 'new': 'matrix_media_repo_container_image_force_pull'}
|
||||
- {'old': 'matrix_media_repo_docker_image_path', 'new': 'matrix_media_repo_container_image_path'}
|
||||
- {'old': 'matrix_media_repo_docker_image_registry_prefix', 'new': 'matrix_media_repo_container_image_registry_prefix'}
|
||||
- {'old': 'matrix_media_repo_docker_image_registry_prefix_upstream', 'new': 'matrix_media_repo_container_image_registry_prefix_upstream'}
|
||||
- {'old': 'matrix_media_repo_docker_image_registry_prefix_upstream_default', 'new': 'matrix_media_repo_container_image_registry_prefix_upstream_default'}
|
||||
- {'old': 'matrix_media_repo_docker_image_tag', 'new': 'matrix_media_repo_container_image_tag'}
|
||||
- {'old': 'matrix_media_repo_docker_src_files_path', 'new': 'matrix_media_repo_container_src_files_path'}
|
||||
|
||||
- name: Fail if required matrix-media-repo settings not defined
|
||||
ansible.builtin.fail:
|
||||
msg: >
|
||||
You need to define a required configuration setting (`{{ item.name }}`).
|
||||
when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
|
||||
with_items:
|
||||
- {'name': 'matrix_media_repo_database_hostname', when: true}
|
||||
- {'name': 'matrix_media_repo_container_labels_traefik_internal_media_entrypoints', when: "{{ matrix_media_repo_container_labels_traefik_internal_media_enabled }}"}
|
||||
- {'name': 'matrix_media_repo_container_labels_traefik_internal_matrix_client_media_entrypoints', when: "{{ matrix_media_repo_container_labels_traefik_internal_matrix_client_media_enabled }}"}
|
||||
- {'name': 'matrix_media_repo_datastore_file_id', when: "{{ (matrix_media_repo_datastore_file_for_kinds | length) > 0 }}"}
|
||||
- {'name': 'matrix_media_repo_datastore_s3_id', when: "{{ (matrix_media_repo_datastore_s3_for_kinds | length) > 0 }}"}
|
||||
|
||||
@@ -38,7 +38,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
|
||||
{% for arg in matrix_media_repo_container_extra_arguments %}
|
||||
{{ arg }} \
|
||||
{% endfor %}
|
||||
{{ matrix_media_repo_docker_image }}
|
||||
{{ matrix_media_repo_container_image }}
|
||||
|
||||
{% for network in matrix_media_repo_container_additional_networks %}
|
||||
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} {{ matrix_media_repo_identifier }}
|
||||
|
||||
Reference in New Issue
Block a user