diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 606f226be11..adb1833610f 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -195,7 +195,7 @@ docker_daemon_graph: "/var/lib/docker" ## This string should be exactly as you wish it to appear. ## An obvious use case is allowing insecure-registry access ## to self hosted registries like so: -docker_options: "--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }}" +docker_options: "--insecure-registry={{ kube_service_addresses }} --graph={{ docker_daemon_graph }} --iptables=false" docker_bin_dir: "/usr/bin" ## Uncomment this if you want to force overlay/overlay2 as docker storage driver diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 1685b0f69d1..c771953ff1e 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -1,4 +1,4 @@ -docker_version: '1.12' +docker_version: '1.13' docker_package_info: pkgs: diff --git a/roles/docker/vars/ubuntu.yml b/roles/docker/vars/ubuntu.yml index fc0d57acd9d..d0477c8d111 100644 --- a/roles/docker/vars/ubuntu.yml +++ b/roles/docker/vars/ubuntu.yml @@ -1,5 +1,4 @@ --- -docker_version: '1.12' docker_kernel_min_version: '3.10' # https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist @@ -7,7 +6,7 @@ docker_versioned_pkg: 'latest': docker-engine '1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} '1.12': docker-engine=1.12.6-0~ubuntu-{{ ansible_distribution_release|lower }} - '1.13': docker-engine=1.13.0-0~ubuntu-{{ ansible_distribution_release|lower }} + '1.13': docker-engine=1.13.1-0~ubuntu-{{ ansible_distribution_release|lower }} docker_package_info: pkg_mgr: apt