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

app-emulation/docker: Bump 17.11 to 17.12

Browse Source
This commit is contained in:
David Michael 2018-01-02 12:04:29 -05:00
parent 89fd0376fa
commit d7d474cbcc
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/Manifest vendored
View File

@ -1,2 +1,2 @@
DIST docker-17.09.1.tar.gz 10135978 SHA256 ac9b1688583c5167fb8d0237da6d6abb3cfa6bc05b2c05590b3bba62eb344d13 SHA512 e968ced32c379b74602053d1e9fe9ee5abe595078bb8d5f0d994c7eafd1557158d58fa48489ca8d7d578dbc7a5241182288b3ab37885b53abb8364d7aa9d2a4f WHIRLPOOL 9cf6949e1f397c2b92c1a2945354cb093daa6715b074ceb3a0cf6828d8a23f9dd5906e6e5a964d39179739990cf49df7f1c1bef014169e0e5cc4519796a93a71
DIST docker-17.11.0.tar.gz 10649392 SHA256 6b0c1596107fcfd824ef6293437130dbf0f6e1ca5b139c221f67044c8b0b3169 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e WHIRLPOOL ecb85d1dfb3eec935c6013e9fbcf14560d9743949ad4ac3169ebd55ee472e25db1a2bfb552946a2f37e4836a5176d2e987f5dad5fe503bea38b0664af91997d1
DIST docker-17.12.0.tar.gz 11011208 SHA256 945e3eb62e35e9399983a956299bbbf878442c5a164262ed82b7aa7366731a83 SHA512 1a4dfc86dc6c85c78d2abf4f559e5efe0fb22d915997f047fa6641e2aefb3e2fc6cb0124b6a0fc69abfc09ac8b261ebbd4d80b380cf9eb4304d3e1a423957b67 WHIRLPOOL 07df0042eeeaac87ca2ffed7c37a6add5826d37cd20b1cb081b00f6ae30d6e310923492b6369f738ef55233b8a15a8e20250aeb402fb3f5865336a70f30ae91e

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

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

@ -1,10 +1,10 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
COREOS_GO_PACKAGE="github.com/docker/docker-ce"
COREOS_GO_VERSION="go1.8"
COREOS_GO_VERSION="go1.9"
if [[ ${PV} = *9999* ]]; then
# Docker cannot be fetched via "go get", thanks to autogenerated code
@ -19,7 +19,7 @@ else
else
MY_PV="$PV-ce"
fi
DOCKER_GITCOMMIT="1caf76c"
DOCKER_GITCOMMIT="486a48d"
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!"
@ -63,9 +63,9 @@ RDEPEND="
sys-process/procps
>=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9
=app-emulation/containerd-1.0.0_beta2_p53[seccomp?]
=app-emulation/docker-runc-1.0.0_rc4_p104[apparmor?,seccomp?]
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
container-init? ( >=sys-process/tini-0.13.1 )
"
@ -211,9 +211,12 @@ src_unpack() {
DOCKER_BUILD_DATE=$(git -C "${S}" log -1 --format="%ct")
fi
[ "${#ENGINE_PATCHES[@]}" -gt 0 ] && eapply -d"${S}"/components/engine "${ENGINE_PATCHES[@]}"
# XXX: fix the insane version in the 17.12.0 tag -- DELETE THIS ON UPDATE
[ "x${PV}-ce" = "x$(<${S}/VERSION)" ] && die || echo "${PV}-ce" > "${S}/VERSION"
}
src_compile() {
local -x DISABLE_WARN_OUTSIDE_CONTAINER=1
go_export
export GOPATH="${WORKDIR}/${P}"
@ -255,13 +258,14 @@ src_compile() {
# build daemon
SOURCE_DATE_EPOCH="${DOCKER_BUILD_DATE}" \
VERSION="$(<../../VERSION)" \
./hack/make.sh dynbinary || die 'dynbinary failed'
popd || die # components/engine
pushd components/cli || die
# Imitating https://github.com/docker/docker-ce/blob/v17.11.0-ce/components/cli/scripts/build/.variables#L6
# Imitating https://github.com/docker/docker-ce/blob/v17.12.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 \