diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml index 8c49d7f28..8fc0aada8 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/defaults/main.yml @@ -34,8 +34,12 @@ matrix_bridge_mautrix_meta_instagram_container_image: "{{ matrix_bridge_mautrix_ matrix_bridge_mautrix_meta_instagram_container_image_registry_prefix: "{{ 'localhost/' if matrix_bridge_mautrix_meta_instagram_container_image_self_build else matrix_bridge_mautrix_meta_instagram_container_image_registry_prefix_upstream }}" matrix_bridge_mautrix_meta_instagram_container_image_registry_prefix_upstream: "{{ matrix_bridge_mautrix_meta_instagram_container_image_registry_prefix_upstream_default }}" matrix_bridge_mautrix_meta_instagram_container_image_registry_prefix_upstream_default: "dock.mau.dev/" +# Since v26.07, Instagram is a separate bridge upstream (its own binary and its own container image). +# Both bridges are published to the same container image repository, with Instagram's tags carrying an `ig-` prefix. +# See: https://mau.fi/blog/2026-07-mautrix-release/#new-instagram-bridge +# # Prebuilt container images for specific commit hashes are tagged with an architecture suffix (e.g. `HASH-amd64`). -matrix_bridge_mautrix_meta_instagram_container_image_tag: "{{ matrix_bridge_mautrix_meta_instagram_version }}{{ ('-' ~ matrix_architecture) if (matrix_bridge_mautrix_meta_instagram_version | length == 40) else '' }}" +matrix_bridge_mautrix_meta_instagram_container_image_tag: "{{ 'ig-' if matrix_bridge_mautrix_meta_instagram_meta_mode == 'instagram' else '' }}{{ matrix_bridge_mautrix_meta_instagram_version }}{{ ('-' ~ matrix_architecture) if (matrix_bridge_mautrix_meta_instagram_version | length == 40) else '' }}" matrix_bridge_mautrix_meta_instagram_container_network: "" diff --git a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml index b0771c277..342bd1be4 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-instagram/tasks/install.yml @@ -71,7 +71,7 @@ ansible.builtin.git: repo: "{{ matrix_bridge_mautrix_meta_instagram_container_image_self_build_repo }}" dest: "{{ matrix_bridge_mautrix_meta_instagram_container_src_files_path }}" - version: "{{ matrix_bridge_mautrix_meta_instagram_container_image.split(':')[1] }}" + version: "{{ matrix_bridge_mautrix_meta_instagram_version }}" force: "yes" become: true become_user: "{{ matrix_user_name }}" diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml index 81bc808bd..015f6d0ed 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/defaults/main.yml @@ -34,8 +34,12 @@ matrix_bridge_mautrix_meta_messenger_container_image: "{{ matrix_bridge_mautrix_ matrix_bridge_mautrix_meta_messenger_container_image_registry_prefix: "{{ 'localhost/' if matrix_bridge_mautrix_meta_messenger_container_image_self_build else matrix_bridge_mautrix_meta_messenger_container_image_registry_prefix_upstream }}" matrix_bridge_mautrix_meta_messenger_container_image_registry_prefix_upstream: "{{ matrix_bridge_mautrix_meta_messenger_container_image_registry_prefix_upstream_default }}" matrix_bridge_mautrix_meta_messenger_container_image_registry_prefix_upstream_default: "dock.mau.dev/" +# Since v26.07, Instagram is a separate bridge upstream (its own binary and its own container image). +# Both bridges are published to the same container image repository, with Instagram's tags carrying an `ig-` prefix. +# See: https://mau.fi/blog/2026-07-mautrix-release/#new-instagram-bridge +# # Prebuilt container images for specific commit hashes are tagged with an architecture suffix (e.g. `HASH-amd64`). -matrix_bridge_mautrix_meta_messenger_container_image_tag: "{{ matrix_bridge_mautrix_meta_messenger_version }}{{ ('-' ~ matrix_architecture) if (matrix_bridge_mautrix_meta_messenger_version | length == 40) else '' }}" +matrix_bridge_mautrix_meta_messenger_container_image_tag: "{{ 'ig-' if matrix_bridge_mautrix_meta_messenger_meta_mode == 'instagram' else '' }}{{ matrix_bridge_mautrix_meta_messenger_version }}{{ ('-' ~ matrix_architecture) if (matrix_bridge_mautrix_meta_messenger_version | length == 40) else '' }}" matrix_bridge_mautrix_meta_messenger_container_network: "" diff --git a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml index 7186702a4..1f814b84e 100644 --- a/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml +++ b/roles/custom/matrix-bridge-mautrix-meta-messenger/tasks/install.yml @@ -71,7 +71,7 @@ ansible.builtin.git: repo: "{{ matrix_bridge_mautrix_meta_messenger_container_image_self_build_repo }}" dest: "{{ matrix_bridge_mautrix_meta_messenger_container_src_files_path }}" - version: "{{ matrix_bridge_mautrix_meta_messenger_container_image.split(':')[1] }}" + version: "{{ matrix_bridge_mautrix_meta_messenger_version }}" force: "yes" become: true become_user: "{{ matrix_user_name }}"