From ebf9daf73e1c35881aea8f7d108fd8939a9eea03 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Sat, 18 Feb 2017 00:33:48 +0100 Subject: [PATCH 1/2] Statically disable iptables management for docker Docker 1.13 changes the behaviour of iptables defaults from allow to drop. This patch disables docker's iptables management as it was in Docker 1.12 [1] [1] https://github.com/docker/docker/pull/28257 Signed-off-by: Sergii Golovatiuk --- inventory/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 606f226be..adb183361 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 From 3bd46f7ac88e308fd2f2b434f685605620d540b4 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Tue, 21 Feb 2017 17:08:47 +0100 Subject: [PATCH 2/2] Switch docker to 1.13 - Remove variable dup for Ubuntu - Update Docker to 1.13 --- roles/docker/defaults/main.yml | 2 +- roles/docker/vars/ubuntu.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 1685b0f69..c771953ff 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 fc0d57acd..d0477c8d1 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