Merge pull request #3730 from elementyang/pr-docker-options
fix modify deprecated --graph flagpull/3742/head
commit
b4eb25197b
|
@ -57,7 +57,11 @@ docker_options: >-
|
||||||
{% if docker_registry_mirrors is defined -%}
|
{% if docker_registry_mirrors is defined -%}
|
||||||
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
|
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
{%- if docker_version is version('17.05', '<') -%}
|
||||||
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||||
|
{%- else -%}
|
||||||
|
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||||
|
{%- endif %}
|
||||||
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
||||||
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
||||||
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
|
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
|
||||||
|
|
|
@ -213,7 +213,11 @@ docker_options: >-
|
||||||
{% if docker_registry_mirrors is defined -%}
|
{% if docker_registry_mirrors is defined -%}
|
||||||
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
|
{{ docker_registry_mirrors | map('regex_replace', '^(.*)$', '--registry-mirror=\1' ) | list | join(' ') }}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
{%- if docker_version is version('17.05', '<') -%}
|
||||||
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
--graph={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||||
|
{%- else -%}
|
||||||
|
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
|
||||||
|
{%- endif %}
|
||||||
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
|
||||||
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current
|
||||||
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
|
--default-runtime=docker-runc --exec-opt native.cgroupdriver=systemd
|
||||||
|
|
Loading…
Reference in New Issue