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

Reorder `matrix_playbook_docker_installation_daemon_options*` variables a bit

pull/4158/head
Slavi Pantaleev 1 год назад
Родитель
Сommit
e33ed912cb
1 измененных файлов: 2 добавлений и 2 удалений
  1. +2
    -2
      group_vars/matrix_servers

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

@@ -21,8 +21,6 @@ matrix_playbook_docker_installation_enabled: true

matrix_playbook_docker_installation_daemon_options: "{{ matrix_playbook_docker_installation_daemon_options_auto | combine(matrix_playbook_docker_installation_daemon_options_custom, recursive=True) }}"

matrix_playbook_docker_installation_daemon_options_file_path: /etc/docker/daemon.json

# Since Docker 27.0.1, Docker daemon options do not need to be changed to enable IPv6 support on the daemon side.
# See: https://docs.docker.com/engine/release-notes/27/#ipv6
# We only enable `ip6tables` and `experimental` for people who explicitly request it (perhaps due to running an old Docker version).
@@ -38,6 +36,8 @@ matrix_playbook_docker_installation_daemon_options_auto: |

matrix_playbook_docker_installation_daemon_options_custom: {}

matrix_playbook_docker_installation_daemon_options_file_path: /etc/docker/daemon.json

# Controls whether to attach Traefik labels to services.
# This is separate from `traefik_enabled`, because you may wish to disable Traefik installation by the playbook,
# yet still use Traefik installed in another way.


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