From 809aadc0a6a7c2756a61a3e793b9a95b85adb213 Mon Sep 17 00:00:00 2001 From: David Michael Date: Thu, 8 Feb 2018 12:54:49 -0500 Subject: [PATCH] app-emulation/docker: Bump 18.01 to 18.02 --- .../coreos-overlay/app-emulation/docker/Manifest | 2 +- .../{docker-18.01.0.ebuild => docker-18.02.0.ebuild} | 0 .../app-emulation/docker/docker-9999.ebuild | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-18.01.0.ebuild => docker-18.02.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest index a0c3c2f4eb..1705bba838 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest @@ -1,2 +1,2 @@ DIST docker-17.12.0.tar.gz 11011208 SHA256 945e3eb62e35e9399983a956299bbbf878442c5a164262ed82b7aa7366731a83 SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67 WHIRLPOOL 07df0042eeeaac87ca2ffed7c37a6add5826d37cd20b1cb081b00f6ae30d6e310923492b6369f738ef55233b8a15a8e20250aeb402fb3f5865336a70f30ae91e -DIST docker-18.01.0.tar.gz 12530532 SHA256 e1c16f0857ed74420e670fdbeb53b7daaa9f5b29ded50c63226941f6b356a4b0 SHA512 e58b23200df811549d8c2ba4b915458b3496b982b264f0aa0ff8c6406e0deb20af2180ea20ac1eaab35cc2a14bea98d6d14d197fdeb54f8c7949dc1b6a336872 WHIRLPOOL ce6f84db6e8ef9ecd25bf3647a0190804b487f91c40afbe4c8455a7da4e0257c609e65bc1e44c4e595a2b9a54289e9f7fcf6428ea895a0e938b74e58cf8dfec7 +DIST docker-18.02.0.tar.gz 12659242 SHA256 fb2b9db5ec1a7e9eb80913fb7790377bbbb0fe5aad033f498d09bcd15a51a5c2 SHA512 4d1bd0ffc893e70fc524f46cacdc4ab035d8b7e0fd7e8de9faf6d9c30b9920b68a99764101e47a8375425b774fe93c317213509b2d1ace87c7598b2b939b849b WHIRLPOOL 6e09cb54bde84c9d901b63c36c1a130badb8d23cd28930b636e7321302bf2e9765763c7f2e76faad5fc170f6ea6210de47c5c70d01e5cd224d4978cfe55cbee9 diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.01.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.02.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.01.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-18.02.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 7594741700..22533fa434 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 @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="03596f5" + DOCKER_GITCOMMIT="fc4de44" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 arm64" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" @@ -64,9 +64,9 @@ RDEPEND=" >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl - =app-emulation/containerd-1.0.0[seccomp?] - =app-emulation/docker-runc-1.0.0_rc4_p171[apparmor?,seccomp?] - app-emulation/docker-proxy + =app-emulation/containerd-1.0.1 + =app-emulation/docker-runc-1.0.0_rc4_p205[apparmor?,seccomp?] + =app-emulation/docker-proxy-0.8.0_p20180112 container-init? ( >=sys-process/tini-0.13.1 ) " @@ -263,7 +263,7 @@ src_compile() { pushd components/cli || die - # Imitating https://github.com/docker/docker-ce/blob/v18.01.0-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v18.02.0-ce/components/cli/scripts/build/.variables#L7 CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')" # build cli emake \