Skip to content
Snippets Groups Projects
Commit fbe9e0ac authored by Hedayat Vatankhah (هدایت)'s avatar Hedayat Vatankhah (هدایت) Committed by Kubernetes Prow Robot
Browse files

Fix docker_options definition when docker_version is 'latest' rather than a number (#3919)

- NOTE: it assumes that the 'latest' version is newer than 17.05
parent 40feb120
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,7 @@ docker_options: >- ...@@ -57,7 +57,7 @@ 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', '<') %} {%- if docker_version != "latest" and 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 }}
......
...@@ -216,7 +216,7 @@ docker_options: >- ...@@ -216,7 +216,7 @@ 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', '<') %} {%- if docker_version != "latest" and 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 }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment