Replace `coturn_docker_image_*`

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

CHANGELOG.md

@@ -4036,7 +4036,7 @@ The following playbook variables were renamed:
 - from `matrix_docker_image_mautrix_telegram` to `matrix_mautrix_telegram_docker_image`
 - from `matrix_docker_image_mautrix_whatsapp` to `matrix_mautrix_whatsapp_docker_image`
 - from `matrix_docker_image_mailer` to `matrix_mailer_docker_image`
-- from `matrix_docker_image_coturn` to `coturn_docker_image`
+- from `matrix_docker_image_coturn` to `coturn_container_image`
 - from `matrix_docker_image_goofys` to `matrix_s3_goofys_docker_image`
 - from `matrix_docker_image_riot` to `matrix_riot_web_docker_image`
 - from `matrix_docker_image_nginx` to `matrix_nginx_proxy_docker_image`

group_vars/matrix_servers

@@ -3108,7 +3108,7 @@ coturn_gid: "{{ matrix_user_gid }}"
 
 coturn_hostname: "{{ matrix_server_fqn_matrix }}"
 
-coturn_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else coturn_docker_image_registry_prefix_upstream_default }}"
+coturn_container_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else coturn_container_image_registry_prefix_upstream_default }}"
 
 coturn_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
 

roles/custom/matrix-coturn/defaults/main.yml

@@ -27,11 +27,11 @@ coturn_container_image_self_build_repo_dockerfile_path: "docker/coturn/alpine/Do
 
 # renovate: datasource=docker depName=coturn/coturn versioning=loose
 coturn_version: 4.8.0
-coturn_docker_image: "{{ coturn_docker_image_registry_prefix }}coturn/coturn:{{ coturn_version }}-alpine"
-coturn_docker_image_registry_prefix: "{{ 'localhost/' if coturn_container_image_self_build else coturn_docker_image_registry_prefix_upstream }}"
-coturn_docker_image_registry_prefix_upstream: "{{ coturn_docker_image_registry_prefix_upstream_default }}"
-coturn_docker_image_registry_prefix_upstream_default: docker.io/
-coturn_docker_image_force_pull: "{{ coturn_docker_image.endswith(':latest') }}"
+coturn_container_image: "{{ coturn_container_image_registry_prefix }}coturn/coturn:{{ coturn_version }}-alpine"
+coturn_container_image_registry_prefix: "{{ 'localhost/' if coturn_container_image_self_build else coturn_container_image_registry_prefix_upstream }}"
+coturn_container_image_registry_prefix_upstream: "{{ coturn_container_image_registry_prefix_upstream_default }}"
+coturn_container_image_registry_prefix_upstream_default: docker.io/
+coturn_container_image_force_pull: "{{ coturn_container_image.endswith(':latest') }}"
 
 # The Docker network that coturn would be put into.
 #

roles/custom/matrix-coturn/tasks/setup_install.yml

@@ -59,10 +59,10 @@
 
 - name: Ensure coturn image is pulled
   community.docker.docker_image:
-    name: "{{ coturn_docker_image }}"
+    name: "{{ coturn_container_image }}"
     source: "{{ 'pull' if ansible_version.major > 2 or ansible_version.minor > 7 else omit }}"
-    force_source: "{{ coturn_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 coturn_docker_image_force_pull }}"
+    force_source: "{{ coturn_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 coturn_container_image_force_pull }}"
   when: "not coturn_container_image_self_build | bool"
   register: result
   retries: "{{ devture_playbook_help_container_retries_count }}"
@@ -83,7 +83,7 @@
 
     - name: Ensure coturn Docker image is built
       community.docker.docker_image:
-        name: "{{ coturn_docker_image }}"
+        name: "{{ coturn_container_image }}"
         source: build
         force_source: "{{ coturn_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 coturn_git_pull_results.changed }}"

roles/custom/matrix-coturn/tasks/validate_config.yml

@@ -15,7 +15,7 @@
     - {'old': 'coturn_docker_network', 'new': 'coturn_container_network'}
     - {'old': 'coturn_container_stun_plain_host_bind_port', 'new': 'superseded by coturn_container_stun_plain_host_bind_port_tcp and coturn_container_stun_plain_host_bind_port_udp'}
     - {'old': 'coturn_container_stun_tls_host_bind_port', 'new': 'superseded by coturn_container_stun_tls_host_bind_port_tcp and coturn_container_stun_tls_host_bind_port_udp'}
-    - {'old': 'coturn_container_image_name_prefix', 'new': 'coturn_docker_image_registry_prefix'}
+    - {'old': 'coturn_container_image_name_prefix', 'new': 'coturn_container_image_registry_prefix'}
 
 - name: Fail if coturn_authentication_method is invalid
   ansible.builtin.fail:

roles/custom/matrix-coturn/templates/systemd/matrix-coturn.service.j2

@@ -46,7 +46,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
 			{% for arg in coturn_container_extra_arguments %}
 			{{ arg }} \
 			{% endfor %}
-			{{ coturn_docker_image }} \
+			{{ coturn_container_image }} \
 			-c /turnserver.conf
 
 {% for network in coturn_container_additional_networks %}

roles/custom/matrix_playbook_migration/tasks/validate_config.yml

@@ -80,6 +80,11 @@
     - {'old': 'cinny_docker_image_registry_prefix_upstream', 'new': 'cinny_container_image_registry_prefix_upstream'}
     - {'old': 'cinny_docker_image_registry_prefix_upstream_default', 'new': 'cinny_container_image_registry_prefix_upstream_default'}
 
+    - {'old': 'coturn_docker_image', 'new': 'coturn_container_image'}
+    - {'old': 'coturn_docker_image_registry_prefix', 'new': 'coturn_container_image_registry_prefix'}
+    - {'old': 'coturn_docker_image_registry_prefix_upstream', 'new': 'coturn_container_image_registry_prefix_upstream'}
+    - {'old': 'coturn_docker_image_registry_prefix_upstream_default', 'new': 'coturn_container_image_registry_prefix_upstream_default'}
+
     - {'old': 'ddclient_docker_image', 'new': 'ddclient_container_image'}
     - {'old': 'ddclient_docker_image_registry_prefix', 'new': 'ddclient_container_image_registry_prefix'}
     - {'old': 'ddclient_docker_image_registry_prefix_upstream', 'new': 'ddclient_container_image_registry_prefix_upstream'}