From 971c7fb251abfd62f9b1f377d4d72a621642d2b2 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 12 Aug 2018 10:42:03 +0100 Subject: [PATCH 1/3] examples: Update all DinD uses to 18.06.0-ce Signed-off-by: Rolf Neugebauer --- examples/cadvisor.yml | 2 +- examples/docker-for-mac.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index 377cd9d2f..dccc0079b 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -31,7 +31,7 @@ services: image: linuxkit/openntpd:v0.6 - name: docker - image: docker:17.10.0-ce-dind + image: docker:18.06.0-ce-dind capabilities: - all net: host diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 82f6df39c..dbc3c7092 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -83,7 +83,7 @@ services: # Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # for vpnkit coordination and /run/config/docker for the configuration file. - name: docker-dfm - image: docker:17.07.0-ce-dind + image: docker:18.06.0-ce-dind capabilities: - all net: host From e392ccce5c59789b3a4cecda33a106c79b9581b8 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 12 Aug 2018 10:42:37 +0100 Subject: [PATCH 2/3] tests: Update docker bench to 18.0.6-ce Signed-off-by: Rolf Neugebauer --- test/cases/030_security/000_docker-bench/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index b8750dae2..1a092ff9e 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -22,7 +22,7 @@ services: - name: dhcpcd image: linuxkit/dhcpcd:v0.6 - name: docker - image: docker:17.07.0-ce-dind + image: docker:18.06.0-ce-dind capabilities: - all mounts: From 0cb45e0dffcf95834e0ace24bafe374b3208b85e Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Sun, 12 Aug 2018 10:50:20 +0100 Subject: [PATCH 3/3] doc: Update release doc with DinD uses which should get updated Signed-off-by: Rolf Neugebauer --- docs/releasing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/releasing.md b/docs/releasing.md index 9e68e9914..d3bd579de 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -208,7 +208,7 @@ have been updates. Specifically: - `pkg/cadvisor`: Check for [new releases](https://github.com/google/cadvisor/releases). - `pkg/firmware` and `pkg/firmware-all`: Use latest commit from [here](https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git). - `pkg/node_exporter`: Check for [new releases](https://github.com/prometheus/node_exporter/releases). -- `example/docker.yml`: Check [docker hub](https://hub.docker.com/r/library/docker/tags/) for the latest `dind` tags. +- Check [docker hub](https://hub.docker.com/r/library/docker/tags/) for the latest `dind` tags. and update `examples/docker.yml`, `examples/docker-for-mac.yml`, `examples/cadvisor.yml`, and `test/cases/030_security/000_docker-bench/test.yml` if necessary. The build/push the packages: