From 915c03f3a0970974f73b5d69aae9e61d81e1094b Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 26 Apr 2017 12:21:48 -0700 Subject: [PATCH] app-emulation/docker: mask bridges from "docker network create" There will be more race conditions from networkd attempting to claim every network interface for users of "docker network" without this Match pattern. Bridges are named "br-" followed by hex. --- .../docker/{docker-1.12.6-r2.ebuild => docker-1.12.6-r3.ebuild} | 0 .../docker/{docker-17.04.0.ebuild => docker-17.04.0-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/50-docker.network | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.6-r2.ebuild => docker-1.12.6-r3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-17.04.0.ebuild => docker-17.04.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.04.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.04.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.04.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.04.0-r1.ebuild 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 4145fd6e37..a0d17b5368 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 @@ -1,6 +1,6 @@ [Match] Type=bridge -Name=docker* +Name=docker* br-* [Link] Unmanaged=yes