From 3e9f8cfcda25dbe5d9b9db7e3c5c9a815a687dae Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Mon, 17 Nov 2014 16:52:01 -0800 Subject: [PATCH] app-emulation/docker,app-admin/flannel: fix flags docker now requires --ip-masq=false if --iptables=false. fix missing space in flanneld.service --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 2 +- .../flannel/{flannel-0.1.0.ebuild => flannel-0.1.0-r1.ebuild} | 0 .../docker/{docker-1.3.0-r1.ebuild => docker-1.3.0-r2.ebuild} | 0 .../app-emulation/docker/files/early-docker.service | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.1.0.ebuild => flannel-0.1.0-r1.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.3.0-r1.ebuild => docker-1.3.0-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service index 4e008a0f2c..0c10e5efc7 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service @@ -22,7 +22,7 @@ ExecStartPost=/bin/bash -c ' \ touch /run/docker_opts.env; \ source /run/docker_opts.env; \ source /run/flannel/subnet.env; \ - DOCKER_OPTS+=--ip-masq=false \ + DOCKER_OPTS+="--ip-masq=false " \ DOCKER_OPTS+=$(test -n "$FLANNEL_SUBNET" && echo "--bip=$FLANNEL_SUBNET "); \ DOCKER_OPTS+=$(test -n "$FLANNEL_MTU" && echo "--mtu=$FLANNEL_MTU "); \ echo "DOCKER_OPTS=\\"$DOCKER_OPTS\\"" >/run/docker_opts.env' diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.1.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.1.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.1.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.0-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.0-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.3.0-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service index 4770a1e0c3..af080a11f5 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/early-docker.service @@ -11,7 +11,7 @@ LimitNOFILE=1048576 LimitNPROC=1048576 # Run docker but don't have docker automatically restart # containers. This is a job for systemd and unit files. -ExecStart=/usr/bin/docker --daemon --storage-driver=btrfs --host=fd:// --bridge=none --iptables=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid +ExecStart=/usr/bin/docker --daemon --storage-driver=btrfs --host=fd:// --bridge=none --iptables=false --ip-masq=false --graph=/var/lib/early-docker --pidfile=/var/run/early-docker.pid [Install] WantedBy=early-docker.target