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

Merge remote-tracking branch 'upstream/master'

pull/1266/head
Michael Collins 4 лет назад
Родитель
Сommit
bdf10462d2
2 измененных файлов: 2 добавлений и 9 удалений
  1. +1
    -8
      roles/matrix-base/tasks/server_base/setup_debian.yml
  2. +1
    -1
      roles/matrix-bridge-heisenbridge/defaults/main.yml

+ 1
- 8
roles/matrix-base/tasks/server_base/setup_debian.yml Просмотреть файл

@@ -23,14 +23,7 @@
repo: "deb [arch={{ matrix_debian_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
state: present
update_cache: yes
when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce' and not ansible_distribution_release == 'bullseye'

- name: Ensure Docker repository is enabled (using Debian Buster on Debian Bullseye, for which there is no Docker yet)
apt_repository:
repo: "deb [arch={{ matrix_debian_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} buster stable"
state: present
update_cache: yes
when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce' and ansible_distribution_release == 'bullseye'
when: matrix_docker_installation_enabled|bool and matrix_docker_package_name == 'docker-ce'

- name: Ensure APT packages are installed
apt:


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

@@ -3,7 +3,7 @@

matrix_heisenbridge_enabled: true

matrix_heisenbridge_version: latest
matrix_heisenbridge_version: 1.0.0
matrix_heisenbridge_docker_image: "{{ matrix_container_global_registry_prefix }}hif1/heisenbridge:{{ matrix_heisenbridge_version }}"
matrix_heisenbridge_docker_image_force_pull: "{{ matrix_heisenbridge_docker_image.endswith(':latest') }}"



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