diff --git a/docker-compose.yml b/docker-compose.yml index 47d3426..e821c89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,13 +3,16 @@ services: cloud: image: bearcloud:latest network_mode: host + environment: + CPU_COUNT: 4 + MEMORY: "4G" + NET_INTERFACE: "" + NET_MAC: "" volumes: - "./data:/image" - - "./test.sh:/test.sh" devices: - "/dev/kvm:/dev/kvm" - "/dev/net/tun:/dev/net/tun" - entrypoint: ["/sbin/tini", "/test.sh"] cap_add: - CAP_SYS_ADMIN - CAP_NET_ADMIN diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh index 5d5c074..b3c0310 100755 --- a/scripts/entrypoint.sh +++ b/scripts/entrypoint.sh @@ -1,9 +1,10 @@ #!/bin/sh set -euo pipefail +API_SOCKET="/hy.socks" _stop() { - ch-remote shutdown-vmm + ch-remote --api-socket "$API_SOCKET" power-button } trap _stop EXIT TERM @@ -12,7 +13,9 @@ trap _stop EXIT TERM --kernel /boot/vmlinuz-virt --initramfs /boot/initramfs-virt \ --disk path=/image/vm.raw,image_type=raw \ --disk path=/image/data.raw,direct=on,image_type=raw \ + --api-socket "$API_SOCKET" \ --cmdline "root=/dev/vda rootfstype=ext4 modules=ext4a rw console=hvc0" \ --cpus boot=${CPU_COUNT:-4} \ --memory size=${MEMORY:-4G},shared=on \ + --net "tap=$NET_INTERFACE,mac=$NET_MAC" $@ diff --git a/test.sh b/test.sh deleted file mode 100755 index f1593be..0000000 --- a/test.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -euo pipefail - -exec /usr/bin/cloud-hypervisor \ - --kernel /boot/vmlinuz-virt --initramfs /boot/initramfs-virt \ - --disk path=/image/vm.raw,image_type=raw \ - --disk path=/image/data.raw,direct=on,image_type=raw \ - --cmdline "modules=ext4 root=/dev/vda rootfstype=ext4 rw console=hvc0" \ - --cpus boot=${CPU_COUNT:-4} \ - --memory size=${MEMORY:-4G},shared=on \ - --net "tap=" - $@