Set `synapse_admin_container_image_*`

Signed-off-by: Suguru Hirahara <did🔑z6MkvVZk1A3KBApWJXv2Ju4H14ErDfRGxh8zxdXSZ4vACDg5>

CHANGELOG.md

@@ -694,8 +694,8 @@ If upstream synapse-admin picks up the pace and improves, the etke.cc fork may d
 If you'd like to switch back to the original synapse-admin software, you can do so by adding the following configuration to your `vars.yml` file:
 
 ```yaml
-synapse_admin_docker_image: "{{ synapse_admin_docker_image_registry_prefix }}awesometechnologies/synapse-admin:{{ synapse_admin_version }}"
-synapse_admin_docker_image_registry_prefix_upstream: docker.io/
+synapse_admin_container_image: "{{ synapse_admin_container_image_registry_prefix }}awesometechnologies/synapse-admin:{{ synapse_admin_version }}"
+synapse_admin_container_image_registry_prefix_upstream: docker.io/
 
 synapse_admin_version: 0.10.3
 

group_vars/matrix_servers

@@ -4999,7 +4999,8 @@ synapse_admin_enabled: false
 
 synapse_admin_identifier: matrix-synapse-admin
 
-synapse_admin_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else synapse_admin_docker_image_registry_prefix_upstream_default }}"
+synapse_admin_container_image_registry_prefix: "{{ 'localhost/' if synapse_admin_container_image_self_build else synapse_admin_container_image_registry_prefix_upstream }}"
+synapse_admin_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else synapse_admin_container_image_registry_prefix_upstream_default }}"
 
 synapse_admin_container_uid: "{{ matrix_user_uid }}"
 synapse_admin_container_gid: "{{ matrix_user_gid }}"

roles/custom/matrix-synapse-admin/defaults/main.yml

@@ -29,11 +29,11 @@ synapse_admin_container_image_self_build_repo: "https://github.com/etkecc/synaps
 
 # renovate: datasource=docker depName=ghcr.io/etkecc/synapse-admin
 synapse_admin_version: v0.11.1-etke53
-synapse_admin_docker_image: "{{ synapse_admin_docker_image_registry_prefix }}etkecc/synapse-admin:{{ synapse_admin_version }}"
-synapse_admin_docker_image_registry_prefix: "{{ 'localhost/' if synapse_admin_container_image_self_build else synapse_admin_docker_image_registry_prefix_upstream }}"
-synapse_admin_docker_image_registry_prefix_upstream: "{{ synapse_admin_docker_image_registry_prefix_upstream_default }}"
-synapse_admin_docker_image_registry_prefix_upstream_default: "ghcr.io/"
-synapse_admin_docker_image_force_pull: "{{ synapse_admin_docker_image.endswith(':latest') }}"
+synapse_admin_container_image: "{{ synapse_admin_container_image_registry_prefix }}etkecc/synapse-admin:{{ synapse_admin_version }}"
+synapse_admin_container_image_registry_prefix: "{{ 'localhost/' if synapse_admin_container_image_self_build else synapse_admin_container_image_registry_prefix_upstream }}"
+synapse_admin_container_image_registry_prefix_upstream: "{{ synapse_admin_container_image_registry_prefix_upstream_default }}"
+synapse_admin_container_image_registry_prefix_upstream_default: "ghcr.io/"
+synapse_admin_container_image_force_pull: "{{ synapse_admin_container_image.endswith(':latest') }}"
 
 # The base container network
 synapse_admin_container_network: synapse-admin

roles/custom/matrix-synapse-admin/tasks/setup_install.yml

@@ -44,10 +44,10 @@
 
 - name: Ensure synapse-admin image is pulled
   community.docker.docker_image:
-    name: "{{ synapse_admin_docker_image }}"
+    name: "{{ synapse_admin_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ synapse_admin_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 synapse_admin_docker_image_force_pull }}"
+    force_source: "{{ synapse_admin_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 synapse_admin_container_image_force_pull }}"
   when: not synapse_admin_container_image_self_build | bool
   register: synapse_admin_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -58,7 +58,7 @@
   ansible.builtin.git:
     repo: "{{ synapse_admin_container_image_self_build_repo }}"
     dest: "{{ synapse_admin_docker_src_files_path }}"
-    version: "{{ synapse_admin_docker_image.split(':')[1] }}"
+    version: "{{ synapse_admin_container_image.split(':')[1] }}"
     force: "yes"
   become: true
   become_user: "{{ matrix_user_name }}"
@@ -67,7 +67,7 @@
 
 - name: Ensure synapse-admin Docker image is built
   community.docker.docker_image:
-    name: "{{ synapse_admin_docker_image }}"
+    name: "{{ synapse_admin_container_image }}"
     source: build
     force_source: "{{ synapse_admin_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 synapse_admin_git_pull_results.changed }}"

roles/custom/matrix-synapse-admin/tasks/validate_config.yml

@@ -18,7 +18,7 @@
     - {'old': 'synapse_admin_container_self_build_repo', 'new': 'synapse_admin_container_image_self_build_repo'}
     - {'old': 'synapse_admin_public_endpoint', 'new': 'synapse_admin_path_prefix'}
     - {'old': 'synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'}
-    - {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_docker_image_registry_prefix'}
+    - {'old': 'synapse_admin_docker_image_name_prefix', 'new': 'synapse_admin_container_image_registry_prefix'}
 
 - when: synapse_admin_container_labels_traefik_enabled | bool
   block:

roles/custom/matrix-synapse-admin/templates/systemd/matrix-synapse-admin.service.j2

@@ -32,7 +32,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in synapse_admin_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ synapse_admin_docker_image }}
+			{{ synapse_admin_container_image }}
 
 {% for network in synapse_admin_container_additional_networks %}
 ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} synapse-admin

roles/custom/matrix_playbook_migration/tasks/validate_config.yml

@@ -95,6 +95,11 @@
     - {'old': 'hydrogen_docker_image_registry_prefix_upstream', 'new': 'hydrogen_container_image_registry_prefix_upstream'}
     - {'old': 'hydrogen_docker_image_registry_prefix_upstream_default', 'new': 'hydrogen_container_image_registry_prefix_upstream_default'}
 
+    - {'old': 'synapse_admin_docker_image', 'new': 'synapse_admin_container_image'}
+    - {'old': 'synapse_admin_docker_image_registry_prefix', 'new': 'synapse_admin_container_image_registry_prefix'}
+    - {'old': 'synapse_admin_docker_image_registry_prefix_upstream', 'new': 'synapse_admin_container_image_registry_prefix_upstream'}
+    - {'old': 'synapse_admin_docker_image_registry_prefix_upstream_default', 'new': 'synapse_admin_container_image_registry_prefix_upstream_default'}
+
 - name: (Deprecation) Catch and report matrix_postgres variables
   ansible.builtin.fail:
     msg: |-