From b3f364933d3ab7bca31dce6c22204c19fdc36d7a Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Wed, 11 Feb 2026 13:30:58 +0900 Subject: [PATCH] Replace `coturn_docker_image_*` Signed-off-by: Suguru Hirahara --- CHANGELOG.md | 2 +- group_vars/matrix_servers | 2 +- roles/custom/matrix-coturn/defaults/main.yml | 10 +++++----- roles/custom/matrix-coturn/tasks/setup_install.yml | 8 ++++---- roles/custom/matrix-coturn/tasks/validate_config.yml | 2 +- .../templates/systemd/matrix-coturn.service.j2 | 2 +- .../tasks/validate_config.yml | 5 +++++ 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e51251b7..803e5a4af 100644 --- a/CHANGELOG.md +++ b/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` diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 876a7e33a..0cf168052 100755 --- a/group_vars/matrix_servers +++ b/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'] }}" diff --git a/roles/custom/matrix-coturn/defaults/main.yml b/roles/custom/matrix-coturn/defaults/main.yml index cb44b9692..ee6749f00 100644 --- a/roles/custom/matrix-coturn/defaults/main.yml +++ b/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. # diff --git a/roles/custom/matrix-coturn/tasks/setup_install.yml b/roles/custom/matrix-coturn/tasks/setup_install.yml index 2ee08f088..39321ef92 100644 --- a/roles/custom/matrix-coturn/tasks/setup_install.yml +++ b/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 }}" diff --git a/roles/custom/matrix-coturn/tasks/validate_config.yml b/roles/custom/matrix-coturn/tasks/validate_config.yml index ceb4716ea..70e3afbe0 100644 --- a/roles/custom/matrix-coturn/tasks/validate_config.yml +++ b/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: diff --git a/roles/custom/matrix-coturn/templates/systemd/matrix-coturn.service.j2 b/roles/custom/matrix-coturn/templates/systemd/matrix-coturn.service.j2 index c0ad57b4f..a5933ce8e 100644 --- a/roles/custom/matrix-coturn/templates/systemd/matrix-coturn.service.j2 +++ b/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 %} diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml index bb7994039..71d4b7897 100644 --- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml +++ b/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'}