Merge pull request #2007 from riyazdf/tool-disk-syntax-change

Tool disk syntax change
This commit is contained in:
Riyaz Faizullabhoy 2017-06-08 20:53:12 -07:00 committed by GitHub
commit 84090f6b4b
5 changed files with 5 additions and 5 deletions

View File

@ -79,5 +79,5 @@ The sample command to run the enclosed is:
``` ```
moby build swap.yml moby build swap.yml
moby run -disk-size 4096 swap linuxkit run -disk size=4G swap
``` ```

View File

@ -2,4 +2,4 @@
disk="kube-master-disk.img" disk="kube-master-disk.img"
set -x set -x
rm -f "${disk}" rm -f "${disk}"
../../bin/linuxkit run -cpus 2 -mem 4096 -disk-size 4096 kube-master ../../bin/linuxkit run -cpus 2 -mem 4096 -disk "${disk}",size=4G kube-master

View File

@ -5,4 +5,4 @@ shift
disk="kube-${name}-disk.img" disk="kube-${name}-disk.img"
set -x set -x
rm -f "${disk}" rm -f "${disk}"
../../bin/linuxkit run -cpus 2 -mem 4096 -disk-size 4096 -disk "${disk}" -data "${*}" kube-node ../../bin/linuxkit run -cpus 2 -mem 4096 -disk "${disk}",size=4G -data "${*}" kube-node

View File

@ -64,5 +64,5 @@ the hardware support is available.
``` ```
../../bin/moby build examples/mirage-dhcp.yml` ../../bin/moby build examples/mirage-dhcp.yml`
../../bin/moby run mirage-dhcp ../../bin/linuxkit run mirage-dhcp
``` ```

View File

@ -28,6 +28,6 @@ down. There are more options to change the behaviour.
## TODO ## TODO
- Add scripts to create Hyper-V VM - Add scripts to create Hyper-V VM
- Enable virtio sockets in `moby run` with HyperKit - Enable virtio sockets in `linuxkit run` with HyperKit
- Add some sample client YAML files which would connect from the VM to the host - Add some sample client YAML files which would connect from the VM to the host
- Hook up to CI for both HyperKit and Hyper-V - Hook up to CI for both HyperKit and Hyper-V