Skip to content

Commit 5ac8f12

Browse files
authored
Merge pull request #4657 from afbjorklund/docker-18.09.7
Upgrade Docker, from 18.09.6 to 18.09.7
2 parents b0b13e1 + 8bea8e7 commit 5ac8f12

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
sha256 8565a655345f3db2f7b78b77a2cd3103895229aa44cd0e4c710ba3559e344b5a v1.2.0.tar.gz
22
sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 v1.2.5.tar.gz
3+
sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 v1.2.6.tar.gz

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.2.5
7-
CONTAINERD_BIN_COMMIT = bb71b10fd8f58240ca47fbb579b9d1028eea7c84
6+
CONTAINERD_BIN_VERSION = v1.2.6
7+
CONTAINERD_BIN_COMMIT = 894b81a4b802e4eb2a91d1ce216b8817763c29fb
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

deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ sha256 a979d9a952fae474886c7588da692ee00684cb2421d2c633c7ed415948cf0b10 docker-
1010
sha256 346f9394393ee8db5f8bd1e229ee9d90e5b36931bdd754308b2ae68884dd6822 docker-18.06.3-ce.tgz
1111
sha256 99ca9395e9c7ffbf75537de71aa828761f492491d02bc6e29db2920fa582c6c5 docker-18.09.5.tgz
1212
sha256 1f3f6774117765279fce64ee7f76abbb5f260264548cf80631d68fb2d795bb09 docker-18.09.6.tgz
13+
sha256 e106ccfa2b1f60794faaa6bae57a2dac9dc4cb33e5541fad6a826ea525d01cc4 docker-18.09.7.tgz

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 = 18.09.6
7+
DOCKER_BIN_VERSION = 18.09.7
88
DOCKER_BIN_SITE = https://download.docker.com/linux/static/stable/x86_64
99
DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
1010

deploy/iso/minikube-iso/package/runc-master/runc-master.hash

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ sha256 9318fa9de6e3b2c89760f08d73bf718c97c93d683611716e024d2f3283c96d90 c1e454b2
44
sha256 a960decadf6bd5d3cee1ca7b94455d37cc921c964061428bd9f3dd17a13c8bb3 6635b4f0c6af3810594d2770f662f34ddc15b40d.tar.gz
55
sha256 ad41ae930059fef18de1926cd78e00474c89290248fecdcc0e431c8aefee1deb 0a012df867a2d525f62a146d8ebdf2e6ab8a5ad5.tar.gz
66
sha256 e52c5d7365b2b9048f977bac8f06bf626dccb4d816d0947ec8523f543272f4ff 2b18fe1d885ee5083ef9f0838fee39b62d653e30.tar.gz
7+
sha256 257ac2c2bbc9770998f31b73f587718848ebb09465ce2cd20fbac198ebd5726e 425e105d5a03fabd737a126ad93d62a9eeede87f.tar.gz

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-
# HEAD as of 2019-03-07
8-
RUNC_MASTER_VERSION = 2b18fe1d885ee5083ef9f0838fee39b62d653e30
7+
# HEAD as of 2019-04-25
8+
RUNC_MASTER_VERSION = 425e105d5a03fabd737a126ad93d62a9eeede87f
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)