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

kubernetes: Assume moby and linuxkit tools are in $PATH

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-08-02 12:07:02 +01:00 committed by Justin Cormack
parent 3b68e087f4
commit 431c8ebdd7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/kubernetes/Makefile
View File

@ -13,10 +13,10 @@ push-container-images:
build-vm-images: kube-master-initrd.img kube-node-initrd.img build-vm-images: kube-master-initrd.img kube-node-initrd.img
kube-master-initrd.img: kube-master.yml kube-master-initrd.img: kube-master.yml
../../bin/moby build -name kube-master kube-master.yml moby build -name kube-master kube-master.yml
kube-node-initrd.img: kube-node.yml kube-node-initrd.img: kube-node.yml
../../bin/moby build -name kube-node kube-node.yml moby build -name kube-node kube-node.yml
clean: clean:
rm -f -r \ rm -f -r \

2
projects/kubernetes/boot.sh
View File

@ -36,4 +36,4 @@ else
fi fi
set -x set -x
rm -rf "${state}" rm -rf "${state}"
../../bin/linuxkit run ${KUBE_RUN_ARGS} -networking ${KUBE_NETWORKING} -cpus ${KUBE_VCPUS} -mem ${KUBE_MEM} -state "${state}" -disk size=${KUBE_DISK} -data "${data}" "${img}" linuxkit run ${KUBE_RUN_ARGS} -networking ${KUBE_NETWORKING} -cpus ${KUBE_VCPUS} -mem ${KUBE_MEM} -state "${state}" -disk size=${KUBE_DISK} -data "${data}" "${img}"