mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-23 07:21:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

app-emulation/docker: use the Unmanaged networkd option

Browse Source 
This also bumps the commit to revert the workaround that previously
addressed the issue.
This commit is contained in:
David Michael 2016-12-05 16:07:08 -08:00
parent 9f6c3e3d9f
commit 9dfb4f7cc3
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild vendored
View File

@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="unknown" DOCKER_GITCOMMIT="unknown"
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="34a2ead3915aa6bf03b5c56b5033203e96e690a1" # coreos-1.12.3 CROS_WORKON_COMMIT="cc361da5ab1aa7df69604a856c8194468e972105" # coreos-1.12.3
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi

3
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network vendored
View File

@ -1,4 +1,5 @@
[Match] [Match]
Driver=veth Driver=veth
[Network] [Link]
Unmanaged=yes

3
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker.network vendored
View File

@ -2,4 +2,5 @@
Type=bridge Type=bridge
Name=docker* Name=docker*
[Network] [Link]
Unmanaged=yes