Skip to content

Commit 788e842

Browse files
authored
Merge pull request #9895 from afbjorklund/docker-20.10.0
Upgrade Docker, from 19.03.14 to 20.10.0
2 parents 877f155 + ac63d9e commit 788e842

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

Diff for: deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 v1.2.12.
77
sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 v1.2.13.tar.gz
88
sha256 d30d59e143697aa4f0960205b3f5ac59c573b332f20507740ef2dc0fb5ae8ded v1.3.7.tar.gz
99
sha256 9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0 v1.3.9.tar.gz
10+
sha256 bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018 v1.4.3.tar.gz

Diff for: deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# containerd
44
#
55
################################################################################
6-
CONTAINERD_BIN_VERSION = v1.3.9
7-
CONTAINERD_BIN_COMMIT = ea765aba0d05254012b0b9e595e995c09186427f
6+
CONTAINERD_BIN_VERSION = v1.4.3
7+
CONTAINERD_BIN_COMMIT = 269548fa27e0089a8b8278fc4fc781d7f65a939b
88
CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
99
CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
1010
CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme

Diff for: deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ sha256 0f4336378f61ed73ed55a356ac19e46699a995f2aff34323ba5874d131548b9e docker-
2323
sha256 88de1b87b8a2582fe827154899475a72fb707c5793cfb39d2a24813ba1f31197 docker-19.03.12.tgz
2424
sha256 ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8 docker-19.03.13.tgz
2525
sha256 9f1ec28e357a8f18e9561129239caf9c0807d74756e21cc63637c7fdeaafe847 docker-19.03.14.tgz
26+
sha256 02936a3585f12f13b21b95e02ae722d74eaf1870b536997e914659ee307b2ac4 docker-20.10.0.tgz

Diff for: deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
DOCKER_BIN_VERSION = 19.03.14
7+
DOCKER_BIN_VERSION = 20.10.0
88
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
99
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
1010

Diff for: deploy/iso/minikube-iso/package/runc-master/runc-master.hash

+1
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ sha256 e52c5d7365b2b9048f977bac8f06bf626dccb4d816d0947ec8523f543272f4ff 2b18fe1d
77
sha256 257ac2c2bbc9770998f31b73f587718848ebb09465ce2cd20fbac198ebd5726e 425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz
88
sha256 4ffe8323397d85dda7d5875fa6bdaf3f8c93592c1947dfa24a034719dc6f728e d736ef14f0288d6993a1845745d6756cfc9ddd5a.tar.gz
99
sha256 defe87a5f15edc54288d3261f5be28219b9b9d904d98c6020eb2e45400a04fb2 dc9208a3303feef5b3839f4323d9beb36df0a9dd.tar.gz
10+
sha256 bfcbbcb12664d5f8c1b794f37a457a8db53291c82be5a3157d8efb91aab193bf ff819c7e9184c13b7c2607fe6c30ae19403a7aff.tar.gz

Diff for: deploy/iso/minikube-iso/package/runc-master/runc-master.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
# As of 2020-01-23, v1.0.0-rc10
8-
RUNC_MASTER_VERSION = dc9208a3303feef5b3839f4323d9beb36df0a9dd
7+
# As of 2020-08-05, v1.0.0-rc92
8+
RUNC_MASTER_VERSION = ff819c7e9184c13b7c2607fe6c30ae19403a7aff
99
RUNC_MASTER_SITE = https://github.com/opencontainers/runc/archive
1010
RUNC_MASTER_SOURCE = $(RUNC_MASTER_VERSION).tar.gz
1111
RUNC_MASTER_LICENSE = Apache-2.0

0 commit comments

Comments
 (0)