Merge pull request #3158 from rn/dock-up

Update all uses of DinD to 18.06.0-ce
This commit is contained in:
Rolf Neugebauer
2018-08-12 23:18:16 +02:00
committed by GitHub
4 changed files with 4 additions and 4 deletions

View File

@@ -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:

View File

@@ -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

View File

@@ -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

View File

@@ -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: