mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-06 18:02:02 +01:00
app-emulation/docker: Bump to 17.06.2
This commit is contained in:
parent
301a6460f8
commit
05a399a1d6
@ -7,7 +7,7 @@ GITHUB_URI="github.com/opencontainers/runc"
|
|||||||
COREOS_GO_PACKAGE="${GITHUB_URI}"
|
COREOS_GO_PACKAGE="${GITHUB_URI}"
|
||||||
COREOS_GO_VERSION="go1.8"
|
COREOS_GO_VERSION="go1.8"
|
||||||
# the commit of runc that docker uses.
|
# the commit of runc that docker uses.
|
||||||
# see https://github.com/docker/docker-ce/blob/v17.06.1-ce/components/engine/hack/dockerfile/binaries-commits#L6
|
# see https://github.com/docker/docker-ce/blob/v17.06.2-ce/components/engine/hack/dockerfile/binaries-commits#L6
|
||||||
# Note: this commit is only really present in `docker/runc` in the 'docker/17.06' branch
|
# Note: this commit is only really present in `docker/runc` in the 'docker/17.06' branch
|
||||||
# Update the patch number when this commit is changed (i.e. the _p in the ebuild).
|
# Update the patch number when this commit is changed (i.e. the _p in the ebuild).
|
||||||
# The patch version is arbitrarily the number of commits since the tag version
|
# The patch version is arbitrarily the number of commits since the tag version
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
DIST docker-17.06.1.tar.gz 9682381 SHA256 2ca8615162873b32d9565f95a4b2977d025fd44c69e087046e004f5dfb1ce30c SHA512 0a7dd578b3f5aa2be9e8df270b74cc5ad698b9c00ed4c314ecfea588cddddef26c0696265978d09abc5799f22f8bd8013b4f1a818e78eb7f7a4e7c15e082b5d0 WHIRLPOOL f6cf32cca15b36b4fa17239ee800d7e9347fc5f97050eca3590c75a76ab4d36ffff676508e7240aef5bd440795a870aa4349f7cede4e9fb4d610a3146693f8d7
|
DIST docker-17.06.2.tar.gz 9684548 SHA256 cfcb5646db32f52c4c394bc688fff405e585beab4ded64251958804a102a5269 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b WHIRLPOOL d0cc166319dbf735d67796df3836f79b24b9108327276ca0ba272398cdc70d6fae4649d9097b6dd29e62633ee636a216343e0d3ffd781cf63ef4c7a7c8cea259
|
||||||
|
|||||||
@ -19,7 +19,7 @@ else
|
|||||||
else
|
else
|
||||||
MY_PV="$PV-ce"
|
MY_PV="$PV-ce"
|
||||||
fi
|
fi
|
||||||
DOCKER_GITCOMMIT="874a737"
|
DOCKER_GITCOMMIT="cec0b72"
|
||||||
# Unix timestamp to use for this build. Set to `date +%s` each time an ebuild
|
# Unix timestamp to use for this build. Set to `date +%s` each time an ebuild
|
||||||
# is edited.
|
# is edited.
|
||||||
# This is required for a reproducible build
|
# This is required for a reproducible build
|
||||||
@ -265,7 +265,7 @@ src_compile() {
|
|||||||
pushd components/cli || die
|
pushd components/cli || die
|
||||||
|
|
||||||
|
|
||||||
# Imitating https://github.com/docker/docker-ce/blob/v17.06.1-ce/components/cli/scripts/build/.variables#L7
|
# Imitating https://github.com/docker/docker-ce/blob/v17.06.2-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/')"
|
CLI_BUILDTIME="$(date -d "@${DOCKER_BUILD_DATE}" --utc --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')"
|
||||||
# build cli
|
# build cli
|
||||||
emake \
|
emake \
|
||||||
|
|||||||
@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64"
|
|||||||
|
|
||||||
# Explicitly list all packages that will be built into the image.
|
# Explicitly list all packages that will be built into the image.
|
||||||
RDEPEND="
|
RDEPEND="
|
||||||
=app-emulation/docker-17.06.1-r1
|
=app-emulation/docker-17.06.2
|
||||||
=app-emulation/containerd-0.2.9_p7
|
=app-emulation/containerd-0.2.9_p7
|
||||||
=app-emulation/docker-proxy-0.8.0_p20170410-r1
|
=app-emulation/docker-proxy-0.8.0_p20170410-r1
|
||||||
=app-emulation/docker-runc-1.0.0_rc3_p53
|
=app-emulation/docker-runc-1.0.0_rc3_p53
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user