瀏覽代碼

Upgrade matrix-corporal (3.1.3 -> 3.1.4) and switch where its gets pulled from

From 3.1.4 and onward, container images will be published to ghcr.io instead of docker.io.

These images are built for arm64 and amd64, but not for arm32 anymore.
pull/4108/head
Slavi Pantaleev 1 年之前
父節點
當前提交
7d4f9fe7dc
共有 2 個檔案被更改,包括 4 行新增4 行删除
  1. +1
    -1
      group_vars/matrix_servers
  2. +3
    -3
      roles/custom/matrix-corporal/defaults/main.yml

+ 1
- 1
group_vars/matrix_servers 查看文件

@@ -3427,7 +3427,7 @@ matrix_corporal_systemd_required_services_list_auto: |

matrix_corporal_docker_image_registry_prefix_upstream: "{{ matrix_container_global_registry_prefix_override if matrix_container_global_registry_prefix_override else matrix_corporal_docker_image_registry_prefix_upstream_default }}"

matrix_corporal_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm32', 'arm64'] }}"
matrix_corporal_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}"

matrix_corporal_container_http_gateway_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '41080') if matrix_playbook_service_host_bind_interface_prefix else '' }}"
matrix_corporal_container_http_api_host_bind_port: "{{ (matrix_playbook_service_host_bind_interface_prefix ~ '41081') if matrix_playbook_service_host_bind_interface_prefix else '' }}"


+ 3
- 3
roles/custom/matrix-corporal/defaults/main.yml 查看文件

@@ -4,8 +4,8 @@

matrix_corporal_enabled: true

# renovate: datasource=docker depName=devture/matrix-corporal
matrix_corporal_version: 3.1.3
# renovate: datasource=docker depName=ghcr.io/devture/matrix-corporal
matrix_corporal_version: 3.1.4

matrix_corporal_container_image_self_build: false
matrix_corporal_container_image_self_build_repo: "https://github.com/devture/matrix-corporal.git"
@@ -84,7 +84,7 @@ matrix_corporal_systemd_required_services_list_custom: []
matrix_corporal_docker_image: "{{ matrix_corporal_docker_image_registry_prefix }}devture/matrix-corporal:{{ matrix_corporal_docker_image_tag }}"
matrix_corporal_docker_image_registry_prefix: "{{ 'localhost/' if matrix_corporal_container_image_self_build else matrix_corporal_docker_image_registry_prefix_upstream }}"
matrix_corporal_docker_image_registry_prefix_upstream: "{{ matrix_corporal_docker_image_registry_prefix_upstream_default }}"
matrix_corporal_docker_image_registry_prefix_upstream_default: docker.io/
matrix_corporal_docker_image_registry_prefix_upstream_default: ghcr.io/
matrix_corporal_docker_image_tag: "{{ matrix_corporal_version }}" # for backward-compatibility
matrix_corporal_docker_image_force_pull: "{{ matrix_corporal_docker_image.endswith(':latest') }}"



Loading…
取消
儲存