Просмотр исходного кода

Upgrade devture/exim-relay (4.95-r0 -> 4.95-r0-1) and disable self-building on ARM32/ARM64

4.95-r0-1 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.
pull/1590/head
Slavi Pantaleev 4 лет назад
Родитель
Сommit
1099ccab43
2 измененных файлов: 2 добавлений и 2 удалений
  1. +1
    -1
      group_vars/matrix_servers
  2. +1
    -1
      roles/matrix-mailer/defaults/main.yml

+ 1
- 1
group_vars/matrix_servers Просмотреть файл

@@ -1320,7 +1320,7 @@ matrix_jitsi_etherpad_base: "{{ matrix_etherpad_base_url if matrix_etherpad_enab
# Other services (like ma1sd), also use the mailer.
matrix_mailer_enabled: true

matrix_mailer_container_image_self_build: "{{ matrix_architecture != 'amd64'}}"
matrix_mailer_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"

######################################################################
#


+ 1
- 1
roles/matrix-mailer/defaults/main.yml Просмотреть файл

@@ -7,7 +7,7 @@ matrix_mailer_container_image_self_build_repository_url: "https://github.com/dev
matrix_mailer_container_image_self_build_src_files_path: "{{ matrix_mailer_base_path }}/docker-src"
matrix_mailer_container_image_self_build_version: "{{ matrix_mailer_docker_image.split(':')[1] }}"

matrix_mailer_version: 4.95-r0
matrix_mailer_version: 4.95-r0-1
matrix_mailer_docker_image: "{{ matrix_mailer_docker_image_name_prefix }}devture/exim-relay:{{ matrix_mailer_version }}"
matrix_mailer_docker_image_name_prefix: "{{ 'localhost/' if matrix_mailer_container_image_self_build else matrix_container_global_registry_prefix }}"
matrix_mailer_docker_image_force_pull: "{{ matrix_mailer_docker_image.endswith(':latest') }}"


Загрузка…
Отмена
Сохранить