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

Merge pull request #2944 from dm0-/docker

Browse Source 
Bump the LTS Docker torcx image to 17.09.1
This commit is contained in:
David Michael 2017-12-08 23:15:06 -05:00 committed by GitHub
commit 2141632344
5 changed files with 6 additions and 6 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-runc/docker-runc-1.0.0_rc4_p25.ebuild vendored
View File

@ -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.09.0-ce/components/engine/hack/dockerfile/binaries-commits#L6 # see https://github.com/docker/docker-ce/blob/v17.09.1-ce/components/engine/hack/dockerfile/binaries-commits#L6
# Note: this commit is only really present in the `docker/runc` repository. # Note: this commit is only really present in the `docker/runc` repository.
# 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

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

@ -1,2 +1,2 @@
DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b 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.11.0.tar.gz 10649392 SHA256 6b0c1596107fcfd824ef6293437130dbf0f6e1ca5b139c221f67044c8b0b3169 SHA512 b9444775fd7bca1e1ec5b2fdeba063f7a7ead4a5b1fd60c836f42f98a8fe9a3a2fe963332e225491280772c9e4024fec5ebfa9b89ab9fa1b83cd60b5afd0333e WHIRLPOOL ecb85d1dfb3eec935c6013e9fbcf14560d9743949ad4ac3169ebd55ee472e25db1a2bfb552946a2f37e4836a5176d2e987f5dad5fe503bea38b0664af91997d1

4
sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.09.0-r1.ebuild → sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-17.09.1.ebuild vendored
View File

@ -19,7 +19,7 @@ else
else else
MY_PV="$PV-ce" MY_PV="$PV-ce"
fi fi
DOCKER_GITCOMMIT="afdb6d4" DOCKER_GITCOMMIT="19e2cf6"
SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://${COREOS_GO_PACKAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!" [ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
@ -261,7 +261,7 @@ src_compile() {
pushd components/cli || die pushd components/cli || die
# Imitating https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/cli/scripts/build/.variables#L6 # Imitating https://github.com/docker/docker-ce/blob/v17.09.1-ce/components/cli/scripts/build/.variables#L6
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 \

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

@ -261,7 +261,7 @@ src_compile() {
pushd components/cli || die pushd components/cli || die
# Imitating https://github.com/docker/docker-ce/blob/v17.09.0-ce/components/cli/scripts/build/.variables#L6 # Imitating https://github.com/docker/docker-ce/blob/v17.11.0-ce/components/cli/scripts/build/.variables#L6
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 \

2
sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-17.09.ebuild vendored
View File

@ -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.09.0-r1 =app-emulation/docker-17.09.1
=app-emulation/containerd-0.2.9_p27 =app-emulation/containerd-0.2.9_p27
=app-emulation/docker-proxy-0.8.0_p20170917 =app-emulation/docker-proxy-0.8.0_p20170917
=app-emulation/docker-runc-1.0.0_rc4_p25 =app-emulation/docker-runc-1.0.0_rc4_p25