mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-03 21:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2300 from dm0-/bugs-1554

Browse Source 
Stop networkd from interfering with Docker network interfaces
This commit is contained in:
David Michael 2016-12-05 16:35:35 -08:00 committed by GitHub
commit 3d5ac219d5
11 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network vendored
View File

@ -1,4 +1,5 @@
[Match] [Match]
Name=flannel* Name=flannel*
[Network] [Link]
Unmanaged=yes

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.2.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.0.3.ebuild vendored
View File

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

@ -1,4 +1,5 @@
[Match] [Match]
Name=flannel* Name=flannel*
[Network] [Link]
Unmanaged=yes

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r4.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.1-r5.ebuild vendored
View File

0
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2.ebuild → sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.6.2-r1.ebuild vendored
View File

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

0
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r7.ebuild → sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-231-r8.ebuild vendored
View File

2
sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild vendored
View File

@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
# Use ~arch instead of empty keywords for compatibility with cros-workon # Use ~arch instead of empty keywords for compatibility with cros-workon
KEYWORDS="~amd64 ~arm64 ~arm ~x86" KEYWORDS="~amd64 ~arm64 ~arm ~x86"
else else
CROS_WORKON_COMMIT="522db85e629525c744e9443f34275bb0fa935d32" # v231-coreos CROS_WORKON_COMMIT="3b66242ad59d09895271f0e067bc93680f235dc5" # v231-coreos
KEYWORDS="amd64 arm64 ~arm ~x86" KEYWORDS="amd64 arm64 ~arm ~x86"
fi fi