github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3158 from rn/dock-up

Browse Source 
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
commit 972c41c4fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/releasing.md
View File

@ -208,7 +208,7 @@ have been updates. Specifically:
- `pkg/cadvisor`: Check for [new releases](https://github.com/google/cadvisor/releases). - `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/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). - `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: The build/push the packages:

2
examples/cadvisor.yml
View File

@ -31,7 +31,7 @@ services:
image: linuxkit/openntpd:v0.6 image: linuxkit/openntpd:v0.6
- name: docker - name: docker
image: docker:17.10.0-ce-dind image: docker:18.06.0-ce-dind
capabilities: capabilities:
- all - all
net: host net: host

2
examples/docker-for-mac.yml
View File

@ -83,7 +83,7 @@ services:
# Bind mounts /var/run to allow vsudd to connect to docker.sock, /var/vpnkit # 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. # for vpnkit coordination and /run/config/docker for the configuration file.
- name: docker-dfm - name: docker-dfm
image: docker:17.07.0-ce-dind image: docker:18.06.0-ce-dind
capabilities: capabilities:
- all - all
net: host net: host

2
test/cases/030_security/000_docker-bench/test.yml
View File

@ -22,7 +22,7 @@ services:
- name: dhcpcd - name: dhcpcd
image: linuxkit/dhcpcd:v0.6 image: linuxkit/dhcpcd:v0.6
- name: docker - name: docker
image: docker:17.07.0-ce-dind image: docker:18.06.0-ce-dind
capabilities: capabilities:
- all - all
mounts: mounts: