mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
Merge pull request #2448 from justincormack/dockerup
Update Docker CE image to 17.06.1
This commit is contained in:
commit
3656a7b03e
@ -3,7 +3,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 /var/config/docker for the configuration file.
|
# for vpnkit coordination and /var/config/docker for the configuration file.
|
||||||
- name: docker-dfm
|
- name: docker-dfm
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
net: host
|
net: host
|
||||||
|
@ -28,7 +28,7 @@ services:
|
|||||||
- name: ntpd
|
- name: ntpd
|
||||||
image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
|
image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
|
||||||
- name: docker
|
- name: docker
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
net: host
|
net: host
|
||||||
|
@ -25,7 +25,7 @@ services:
|
|||||||
- name: ntpd
|
- name: ntpd
|
||||||
image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
|
image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
|
||||||
- name: docker
|
- name: docker
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
mounts:
|
mounts:
|
||||||
|
@ -25,7 +25,7 @@ services:
|
|||||||
- name: ntpd
|
- name: ntpd
|
||||||
image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
|
image: linuxkit/openntpd:0d7befc79842849d0b88d6c3b64200e340d7cf67
|
||||||
- name: docker
|
- name: docker
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
mounts:
|
mounts:
|
||||||
|
@ -33,7 +33,7 @@ services:
|
|||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
|
image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
|
||||||
- name: docker
|
- name: docker
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
pid: host
|
pid: host
|
||||||
|
@ -33,7 +33,7 @@ services:
|
|||||||
- name: sshd
|
- name: sshd
|
||||||
image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
|
image: linuxkit/sshd:505a985d7bd7a90f15eca9cb4dc6ec92789d51a0
|
||||||
- name: docker
|
- name: docker
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
pid: host
|
pid: host
|
||||||
|
@ -22,7 +22,7 @@ services:
|
|||||||
- name: dhcpcd
|
- name: dhcpcd
|
||||||
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7
|
image: linuxkit/dhcpcd:f3f5413abb78fae9020e35bd4788fa93df4530b7
|
||||||
- name: docker
|
- name: docker
|
||||||
image: docker:17.06.0-ce-dind
|
image: docker:17.06.1-ce-dind
|
||||||
capabilities:
|
capabilities:
|
||||||
- all
|
- all
|
||||||
mounts:
|
mounts:
|
||||||
|
Loading…
Reference in New Issue
Block a user