Skip to content
Snippets Groups Projects
Commit 02137f8c authored by Matthew Mosesohn's avatar Matthew Mosesohn Committed by GitHub
Browse files

Merge pull request #1059 from holser/docker_iptables

iptables switch for docker
parents 43ea281a 3bd46f7a
No related branches found
No related tags found
No related merge requests found
...@@ -195,7 +195,7 @@ docker_daemon_graph: "/var/lib/docker" ...@@ -195,7 +195,7 @@ docker_daemon_graph: "/var/lib/docker"
## This string should be exactly as you wish it to appear. ## This string should be exactly as you wish it to appear.
## An obvious use case is allowing insecure-registry access ## An obvious use case is allowing insecure-registry access
## to self hosted registries like so: ## 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" docker_bin_dir: "/usr/bin"
## Uncomment this if you want to force overlay/overlay2 as docker storage driver ## Uncomment this if you want to force overlay/overlay2 as docker storage driver
......
docker_version: '1.12' docker_version: '1.13'
docker_package_info: docker_package_info:
pkgs: pkgs:
......
--- ---
docker_version: '1.12'
docker_kernel_min_version: '3.10' docker_kernel_min_version: '3.10'
# https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist # https://apt.dockerproject.org/repo/dists/ubuntu-xenial/main/filelist
...@@ -7,7 +6,7 @@ docker_versioned_pkg: ...@@ -7,7 +6,7 @@ docker_versioned_pkg:
'latest': docker-engine 'latest': docker-engine
'1.11': docker-engine=1.11.1-0~{{ ansible_distribution_release|lower }} '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.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: docker_package_info:
pkg_mgr: apt pkg_mgr: apt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment