From fac37442a5ee68334df1d849f06682f60af29cad Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 18 Jan 2017 13:30:47 -0800 Subject: [PATCH] app-emulation/docker: upgrade to unpatched 1.13.0 --- .../docker/{docker-1.12.6.ebuild => docker-1.13.0.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.6.ebuild => docker-1.13.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.13.0.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 42970e94c9..846703e032 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 @@ -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