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

Merge pull request #2464 from rn/dock-up

Browse Source 
Update DinD from 17.06.1-ce to 17.07.0-ce
This commit is contained in:
Riyaz Faizullabhoy 2017-08-31 09:43:53 -07:00 committed by GitHub
commit fb8a1bf39f
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blueprints/README.md
View File

@ -24,10 +24,10 @@ the [examples/](../examples/) directory.
An initial blueprint for the open source components of Docker for Mac is available in [docker-for-mac](docker-for-mac). The blueprint has support for controlling `dockerd` from the host via `vsudd` and port forwarding with VPNKit. It requires HyperKit, VPNKit and a Docker client on the host to run. The easiest way to install these at the moment is to install a recent version of Docker for Mac. An initial blueprint for the open source components of Docker for Mac is available in [docker-for-mac](docker-for-mac). The blueprint has support for controlling `dockerd` from the host via `vsudd` and port forwarding with VPNKit. It requires HyperKit, VPNKit and a Docker client on the host to run. The easiest way to install these at the moment is to install a recent version of Docker for Mac.
To build it with Docker 17.06: To build it with the latest Docker CE:
``` ```
$ moby build -name docker-for-mac base.yml docker-17.06-ce.yml $ moby build -name docker-for-mac base.yml docker-ce.yml
``` ```
To run the VM with a 500M disk: To run the VM with a 500M disk:

2
blueprints/docker-for-mac/docker-17.06-ce.yml → blueprints/docker-for-mac/docker-ce.yml
View File

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
net: host net: host

2
examples/docker.yml
View File

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
net: host net: host

2
projects/compose/compose-dynamic.yml
View File

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
mounts: mounts:

2
projects/compose/compose-static.yml
View File

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
mounts: mounts:

2
projects/kubernetes/kube-master.yml
View File

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
pid: host pid: host

2
projects/kubernetes/kube-node.yml
View File

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
pid: host pid: host

2
test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh
View File

@ -18,7 +18,7 @@ clean_up() {
trap clean_up EXIT trap clean_up EXIT
# Test code goes here # Test code goes here
moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-17.06-ce.yml" moby build -name "${IMAGE_NAME}" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/base.yml" "${LINUXKIT_BLUEPRINTS_DIR}/${IMAGE_NAME}/docker-ce.yml"
exit 0 exit 0

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

@ -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.1-ce-dind image: docker:17.07.0-ce-dind
capabilities: capabilities:
- all - all
mounts: mounts: