Skip to content
Snippets Groups Projects
Commit 551317f1 authored by Erwan Miran's avatar Erwan Miran Committed by k8s-ci-robot
Browse files

Fix docker_options jinja syntax (#3770)

parent ddc19f43
No related branches found
No related tags found
No related merge requests found
...@@ -51,15 +51,15 @@ docker_rpm_keepcache: 0 ...@@ -51,15 +51,15 @@ docker_rpm_keepcache: 0
## A string of extra options to pass to the docker daemon. ## A string of extra options to pass to the docker daemon.
## This string should be exactly as you wish it to appear. ## This string should be exactly as you wish it to appear.
docker_options: >- docker_options: >-
{%- if docker_insecure_registries is defined -%} {%- if docker_insecure_registries is defined %}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} {{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
{% 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', '<') -%} {%- if docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else -%} {%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }} --data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- endif %} {%- endif %}
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
......
...@@ -207,15 +207,15 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5" ...@@ -207,15 +207,15 @@ docker_log_opts: "--log-opt max-size=50m --log-opt max-file=5"
## A string of extra options to pass to the docker daemon. ## A string of extra options to pass to the docker daemon.
## This string should be exactly as you wish it to appear. ## This string should be exactly as you wish it to appear.
docker_options: >- docker_options: >-
{%- if docker_insecure_registries is defined -%} {%- if docker_insecure_registries is defined %}
{{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }} {{ docker_insecure_registries | map('regex_replace', '^(.*)$', '--insecure-registry=\1' ) | list | join(' ') }}
{%- endif %} {%- endif %}
{% 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', '<') -%} {%- if docker_version is version('17.05', '<') %}
--graph={{ docker_daemon_graph }} {{ docker_log_opts }} --graph={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- else -%} {%- else %}
--data-root={{ docker_daemon_graph }} {{ docker_log_opts }} --data-root={{ docker_daemon_graph }} {{ docker_log_opts }}
{%- endif %} {%- endif %}
{%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %} {%- if ansible_architecture == "aarch64" and ansible_os_family == "RedHat" %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment