From 6d0aad564c4fed0b62ecebd2982a7f6ff81da968 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 28 Feb 2018 10:53:18 -0500 Subject: [PATCH] app-emulation/docker: Bump 17.12.0 to 17.12.1 --- .../coreos-overlay/app-emulation/docker/Manifest | 2 +- .../{docker-17.12.0.ebuild => docker-17.12.1.ebuild} | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-17.12.0.ebuild => docker-17.12.1.ebuild} (97%) 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 c495fdd5a6..06b9a3b97b 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 11008332 SHA256 1303483c878ded1c0e19f323f04316cef6d4c0c895f85c412af6468647d18ef9 SHA512 7381bddf4b2538b2b76229d962925eee74a38ddbb18a6f988ccff2a2ce0ef334148ea76d9697e89acc6c9018cb6f785b59c27450dfb930ead01fa5684c6a90b1 WHIRLPOOL 1d9ee9131fc2a9dc53369a67d83a29d1f9f6dec3d66942ae17a5fabd455e5de24456aaaf2d21458854532174d5623c9116c8478f7c0af1447fa8d89653854fc6 +DIST docker-17.12.1.tar.gz 11046888 SHA256 e4b58c26c05a800d96d3e5d76375654751d4d1367b5727c798369cf3c78a590e SHA512 ca9c28a489c6c65de27cb64e68c783336e2ddca7e7b2d241e9557a43e62e33146afb644aa67fe92afce658522c02fbe0378b3c1318a32628c1a1a046c67a4fb7 WHIRLPOOL 218d61a35648b1b58ec0c4f63bbb06695b4739469bcfdf84745886085f1eca5472b59da35514d35f4835bec388b79109dd3c8bd449e86a3dffabb6c9e865d623 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-17.12.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.1.ebuild similarity index 97% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.1.ebuild index eabf24664b..00e5b8af38 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.12.1.ebuild @@ -19,7 +19,7 @@ else else MY_PV="$PV-ce" fi - DOCKER_GITCOMMIT="c97c6d6" + DOCKER_GITCOMMIT="7390fc6" 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_p20170917 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/v17.12.0-ce/components/cli/scripts/build/.variables#L7 + # Imitating https://github.com/docker/docker-ce/blob/v17.12.1-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 \