Merge pull request #9861 from afbjorklund/docker-19.03.14

medyagh · web-flow · commit dd6a445db1ca · 2020-12-08T10:13:06.000-08:00
Upgrade Docker, from 19.03.13 to 19.03.14
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.hash
@@ -6,3 +6,4 @@ sha256 a0965e1492fca558629826f1aa89a9675de3d451cec67540400b30c0bf6ac387 v1.2.10.
 sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 v1.2.12.tar.gz
 sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 v1.2.13.tar.gz
 sha256 d30d59e143697aa4f0960205b3f5ac59c573b332f20507740ef2dc0fb5ae8ded v1.3.7.tar.gz
+sha256 9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0 v1.3.9.tar.gz
diff --git a/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/package/containerd-bin/containerd-bin.mk
@@ -3,8 +3,8 @@
 # containerd
 #
 ################################################################################
-CONTAINERD_BIN_VERSION = v1.3.7
-CONTAINERD_BIN_COMMIT = 8fba4e9a7d01810a393d5d25a3621dc101981175
+CONTAINERD_BIN_VERSION = v1.3.9
+CONTAINERD_BIN_COMMIT = ea765aba0d05254012b0b9e595e995c09186427f
 CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
 CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
 CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme
diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
@@ -22,3 +22,4 @@ sha256 7c1576a0bc749418d1423d2b78c8920b5d61f849789904612862dd118742e82b  docker-
 sha256 0f4336378f61ed73ed55a356ac19e46699a995f2aff34323ba5874d131548b9e  docker-19.03.11.tgz
 sha256 88de1b87b8a2582fe827154899475a72fb707c5793cfb39d2a24813ba1f31197  docker-19.03.12.tgz
 sha256 ddb13aff1fcdcceb710bf71a210169b9c1abfd7420eeaf42cf7975f8fae2fcc8  docker-19.03.13.tgz
+sha256 9f1ec28e357a8f18e9561129239caf9c0807d74756e21cc63637c7fdeaafe847  docker-19.03.14.tgz
diff --git a/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_BIN_VERSION = 19.03.13
+DOCKER_BIN_VERSION = 19.03.14
 DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
 DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`################################################################################`
`6`	`6`
`7`		`-DOCKER_BIN_VERSION = 19.03.13`
	`7`	`+DOCKER_BIN_VERSION = 19.03.14`
`8`	`8`	`DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64`
`9`	`9`	`DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz`
`10`	`10`