From 9dfb4f7cc39e47ebbf67e575bdca8fb3dde6bacc Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 5 Dec 2016 16:07:08 -0800 Subject: [PATCH] app-emulation/docker: use the Unmanaged networkd option This also bumps the commit to revert the workaround that previously addressed the issue. --- .../{docker-1.12.3-r1.ebuild => docker-1.12.3-r2.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../app-emulation/docker/files/50-docker-veth.network | 3 ++- .../app-emulation/docker/files/50-docker.network | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.3-r1.ebuild => docker-1.12.3-r2.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index 6a4e103356..cab3110c36 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="34a2ead3915aa6bf03b5c56b5033203e96e690a1" # coreos-1.12.3 + CROS_WORKON_COMMIT="cc361da5ab1aa7df69604a856c8194468e972105" # coreos-1.12.3 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" fi diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network index 79e078bdc9..3ca3816c23 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network @@ -1,4 +1,5 @@ [Match] Driver=veth -[Network] +[Link] +Unmanaged=yes diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network index 4fcc34c0c2..4145fd6e37 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network @@ -2,4 +2,5 @@ Type=bridge Name=docker* -[Network] +[Link] +Unmanaged=yes