From 5a5f1e0a22ab6d2a6e6dbef838d619be1b276da6 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 25 Sep 2017 17:06:47 -0700 Subject: [PATCH 1/2] app-emulation/docker: bump 1.12.6 This includes the the layer-store corruption patch --- .../docker/{docker-1.12.6-r6.ebuild => docker-1.12.6-r7.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.6-r6.ebuild => docker-1.12.6-r7.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r6.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r7.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r6.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r7.ebuild index e968422ad2..441e437b87 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r6.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.6-r7.ebuild @@ -9,7 +9,7 @@ CROS_WORKON_LOCALNAME="docker" CROS_WORKON_REPO="git://github.com" COREOS_GO_VERSION="go1.7" -CROS_WORKON_COMMIT="a82d35e3daba1a2cd48c66e57a4f9975c39c45c6" # coreos-1.12.6 +CROS_WORKON_COMMIT="30311de9dd5ef2e00299913cf4418e12ed09b406" # coreos-1.12.6 DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64 arm64" From eb758878f8ba3b85d113560caaa67781b0ab23c3 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Mon, 25 Sep 2017 17:07:59 -0700 Subject: [PATCH 2/2] app-torcx/docker: bump docker 1.12.6 version --- .../coreos-overlay/app-torcx/docker/docker-1.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild index 3a06df6af3..a122a9860a 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-1.12.ebuild @@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - =app-emulation/docker-1.12.6-r6 + =app-emulation/docker-1.12.6-r7 =app-emulation/containerd-0.2.5-r3 =app-emulation/runc-1.0.0_rc2_p9 "