mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-03 10:38:19 -03:30
Compare commits
3 Commits
v2.8.5
...
release-2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d3f6079991 | ||
|
|
7aa8b82512 | ||
|
|
ec974e16fa |
@@ -1,4 +1,4 @@
|
|||||||
ansible>=2.5.0,!=2.7.0
|
ansible>=2.5.0,<2.7
|
||||||
jinja2>=2.9.6
|
jinja2>=2.9.6
|
||||||
netaddr
|
netaddr
|
||||||
pbr>=1.6
|
pbr>=1.6
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ docker_kernel_min_version: '0'
|
|||||||
docker_versioned_pkg:
|
docker_versioned_pkg:
|
||||||
'latest': docker-ce
|
'latest': docker-ce
|
||||||
'18.03': docker-ce-18.03.1.ce-3.fc28
|
'18.03': docker-ce-18.03.1.ce-3.fc28
|
||||||
'18.06': docker-ce-18.06.2.ce-3.fc28
|
'18.06': docker-ce-18.06.3.ce-3.fc28
|
||||||
|
|
||||||
#
|
#
|
||||||
# This is due to the fact that the docker
|
# This is due to the fact that the docker
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ docker_versioned_pkg:
|
|||||||
'17.09': docker-ce-17.09.0.ce-1.el7.centos
|
'17.09': docker-ce-17.09.0.ce-1.el7.centos
|
||||||
'17.12': docker-ce-17.12.1.ce-1.el7.centos
|
'17.12': docker-ce-17.12.1.ce-1.el7.centos
|
||||||
'18.03': docker-ce-18.03.1.ce-1.el7.centos
|
'18.03': docker-ce-18.03.1.ce-1.el7.centos
|
||||||
'18.06': docker-ce-18.06.2.ce-3.el7
|
'18.06': docker-ce-18.06.3.ce-3.el7
|
||||||
'stable': docker-ce-18.06.2.ce-3.el7
|
'stable': docker-ce-18.06.3.ce-3.el7
|
||||||
'edge': docker-ce-17.12.1.ce-1.el7.centos
|
'edge': docker-ce-17.12.1.ce-1.el7.centos
|
||||||
|
|
||||||
docker_selinux_versioned_pkg:
|
docker_selinux_versioned_pkg:
|
||||||
|
|||||||
@@ -213,7 +213,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 is defined 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 }}
|
||||||
|
|||||||
Reference in New Issue
Block a user