From 4a4d718f7c261d6190499fca1a9b7765e711c436 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 31 Jan 2022 16:52:49 +0200 Subject: [PATCH] Upgrade matrix-corporal (2.2.2 -> 2.2.3) and disable self-building on ARM32/ARM64 2.2.3 is the first container image tag that is available as a multi-arch image with support for linux/amd64, linux/arm64/v8 (arm64) and linux/arm/v7 (arm32), so self-building is no longer necessary on all these platforms. --- group_vars/matrix_servers | 2 +- roles/matrix-corporal/defaults/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 835b9245..c12ad127 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -1059,7 +1059,7 @@ matrix_bot_mjolnir_systemd_required_services_list: | matrix_corporal_enabled: false -matrix_corporal_container_image_self_build: "{{ matrix_architecture != 'amd64' }}" +matrix_corporal_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}" # Normally, matrix-nginx-proxy is enabled and nginx can reach matrix-corporal over the container network. # If matrix-nginx-proxy is not enabled, or you otherwise have a need for it, you can expose diff --git a/roles/matrix-corporal/defaults/main.yml b/roles/matrix-corporal/defaults/main.yml index aede4d50..47f0b5af 100644 --- a/roles/matrix-corporal/defaults/main.yml +++ b/roles/matrix-corporal/defaults/main.yml @@ -22,7 +22,7 @@ matrix_corporal_container_extra_arguments: [] # List of systemd services that matrix-corporal.service depends on matrix_corporal_systemd_required_services_list: ['docker.service'] -matrix_corporal_version: 2.2.2 +matrix_corporal_version: 2.2.3 matrix_corporal_docker_image: "{{ matrix_corporal_docker_image_name_prefix }}devture/matrix-corporal:{{ matrix_corporal_docker_image_tag }}" matrix_corporal_docker_image_name_prefix: "{{ 'localhost/' if matrix_corporal_container_image_self_build else matrix_container_global_registry_prefix }}" matrix_corporal_docker_image_tag: "{{ matrix_corporal_version }}" # for backward-compatibility