From f8c6f9b935a5aa647c8958c99a173b89e09efffc Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Wed, 3 Feb 2021 07:51:42 +0000 Subject: [PATCH] app-emulation: Upgrade Docker 19.03.14 to 19.03.15 --- .../app-emulation/docker-runc/docker-runc-1.0.0_rc92.ebuild | 2 +- .../third_party/coreos-overlay/app-emulation/docker/Manifest | 2 +- .../docker/{docker-19.03.14.ebuild => docker-19.03.15.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- .../coreos-overlay/app-torcx/docker/docker-19.03.ebuild | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-19.03.14.ebuild => docker-19.03.15.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc92.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc92.ebuild index 7b08b31855..c9f500229c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc92.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.0.0_rc92.ebuild @@ -7,7 +7,7 @@ GITHUB_URI="github.com/opencontainers/runc" COREOS_GO_PACKAGE="${GITHUB_URI}" COREOS_GO_VERSION="go1.13" # the commit of runc that docker uses. -# see https://github.com/docker/docker-ce/blob/v19.03.14/components/engine/hack/dockerfile/install/runc.installer#L4 +# see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4 # 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 # specified in the ebuild name. For example: 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 d882a875d6..1aa170b3c6 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 +1 @@ -DIST docker-19.03.14.tar.gz 18278132 BLAKE2B 5e32cb482fdc40531aa4ba79dd447093859f568b3d8b5c3ed584c78d5709fabf2a1e05e82af2686cd87462e1abd899bd3f0a746f97937b7d16950f5e94264dff SHA512 5e48185a7787d5637fc11f43f6af604d56a5fa4367fd5a558bb3a5ef3c0d767f1c7f83ecef369453696b68eed81e49520453f267fbe8c2b840b3f62d35f25c28 +DIST docker-19.03.15.tar.gz 18284803 BLAKE2B a1fac5d841934382d12c781353546b7c7a8167d0f2dc4150659a4aece210ea7361c59de25e3d450dae20fd536ea8dc33a18e55f9565ee4fdc818166810391fbf SHA512 ffd8e683a93a6ce69789603d24457aebe3379594692cb3dadc25bc8d407771a29d76087b0ca70856707f151622b1853f283a1071311c033ff90a1e44b0d9ffbc diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.14.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.15.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.14.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-19.03.15.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 5298186d08..1bb9b337f8 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" fi - DOCKER_GITCOMMIT="f8db474" + DOCKER_GITCOMMIT="6ff149b" 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!" diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild index 6b8c43b448..9d627767c8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-19.03.ebuild @@ -11,7 +11,7 @@ KEYWORDS="amd64 arm64" # Explicitly list all packages that will be built into the image. RDEPEND=" - ~app-emulation/docker-19.03.14 + ~app-emulation/docker-19.03.15 ~app-emulation/containerd-1.4.3 ~app-emulation/docker-proxy-0.8.0_p20180709 ~app-emulation/docker-runc-1.0.0_rc92