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

Merge pull request #2381 from dm0-/docker

Browse Source 
Upgrade to Docker 1.13
This commit is contained in:
David Michael 2017-01-30 12:41:14 -08:00 committed by GitHub
commit 2b1adc04cf
6 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/Manifest vendored Normal file
View File

@ -0,0 +1 @@
DIST docker-proxy-0.8.0_p20161111.tar.gz 2150464 SHA256 204e723a3cb740173af3a0d4b0d00996507d3230da4f348a38b417a215de0959 SHA512 86293b9cafc3c468760266b47412040f21309baad27765f584cfa1e93bc2ad88068832ed55f2ae8e4f16825e9f44619e89985fd36d98b3d47eaf1d1160f76c8e WHIRLPOOL 2b885bf3865a396219af7b32fc20477b15dffa1ac7b8a26602ff1b131d9f7cb31d5f997045bfac5ddf8b75016ca083c31ed345dfe1d9023a8d68b712a72d5979

1
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild vendored Symbolic link
View File

@ -0,0 +1 @@
docker-proxy-9999.ebuild

40
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild vendored Normal file
View File

@ -0,0 +1,40 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EGO_PN="github.com/docker/libnetwork"
COREOS_GO_PACKAGE="${EGO_PN}"
COREOS_GO_VERSION="go1.7"
if [[ ${PV} == *9999 ]]; then
KEYWORDS="~amd64 ~arm64"
inherit golang-vcs
else
EGIT_COMMIT="57be722e077059d1ee0539be31743a3642ccbeb3"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64"
inherit golang-vcs-snapshot
fi
inherit coreos-go
DESCRIPTION="Docker container networking"
HOMEPAGE="http://github.com/docker/libnetwork"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
S=${WORKDIR}/${P}/src/${EGO_PN}
RDEPEND="!<app-emulation/docker-1.13.0_rc1"
src_compile() {
go_build "${COREOS_GO_PACKAGE}/cmd/proxy"
}
src_install() {
newbin "${GOBIN}"/proxy docker-proxy
}

21
sdk_container/src/third_party/coreos-overlay/app-emulation/docker-proxy/metadata.xml vendored Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription>
</longdescription>
<maintainer type="person">
<email>tianon@dockerproject.org</email>
<name>Tianon</name>
</maintainer>
<maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
<maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
<upstream>
<remote-id type="github">docker/libnetwork</remote-id>
</upstream>
</pkgmetadata>

0
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.0.ebuild vendored
View File

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

@ -7,13 +7,13 @@ EAPI=5
CROS_WORKON_PROJECT="coreos/docker"
CROS_WORKON_LOCALNAME="docker"
CROS_WORKON_REPO="git://github.com"
COREOS_GO_VERSION="go1.6"
COREOS_GO_VERSION="go1.7"
if [[ ${PV} == *9999 ]]; then
DOCKER_GITCOMMIT="unknown"
KEYWORDS="~amd64 ~arm64"
else
CROS_WORKON_COMMIT="d5236f0452873048a28c1ecd63d40513efa66542" #coreos-1.12.6
CROS_WORKON_COMMIT="49bf474f9ed7ce7143a59d1964ff7b7fd9b52178" # coreos-1.13.0
DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}"
KEYWORDS="amd64 arm64"
fi
@ -68,6 +68,7 @@ RDEPEND="
>=app-emulation/containerd-0.2.5[seccomp?]
>=app-emulation/runc-1.0.0_rc2-r2[apparmor?,seccomp?]
app-emulation/docker-proxy
"
RESTRICT="installsources strip"
@ -269,7 +270,6 @@ src_install() {
VERSION="$(cat VERSION)"
newbin "bundles/$VERSION/dynbinary-client/docker-$VERSION" docker
newbin "bundles/$VERSION/dynbinary-daemon/dockerd-$VERSION" dockerd
newbin "bundles/$VERSION/dynbinary-daemon/docker-proxy-$VERSION" docker-proxy
dosym containerd /usr/bin/docker-containerd
dosym containerd-shim /usr/bin/docker-containerd-shim
dosym runc /usr/bin/docker-runc