feat: split runtime and image

erlnby · erlnby · commit 07a1938a6ee5 · 2025-04-18T07:32:55.000Z
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /blobs
+/images
diff --git a/ci-config/meta-data b/ci-config/meta-data
@@ -0,0 +1,2 @@
+instance-id: iid-local1
+local-hostname: my-vm
diff --git a/ci-config/network-config b/ci-config/network-config
@@ -0,0 +1,8 @@
+version: 2
+ethernets:
+  ens3:
+    dhcp4: false
+    addresses: [172.20.0.2/16]
+    gateway4: 172.20.0.1
+    nameservers:
+      addresses: [8.8.8.8, 1.1.1.1]
diff --git a/ci-config/user-data b/ci-config/user-data
@@ -0,0 +1,14 @@
+#cloud-config
+hostname: my-vm
+manage_etc_hosts: true
+fqdn: my-vm
+user: user
+password: $5$KXasYhNX$QkJkEVjIhA/.W1qjTPhJzgJXeZpvu8RSsGx1HqaxX23
+ssh_authorized_keys:
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMBEMPGKBgwtQaQ3un8I7j3wIzrknlCUUoetLWJCwfzn erlnby@DESKTOP-46HDCTP
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJx/50sox9LvHx1rrkmOYjn4hitH3jvkm4JomiMdwLUz utkin_danil@mail.ru
+  - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICeyDWnYtatyEiHKjT/jpLUA7FLMoe97ItrkaLA2cYsX qemu_machine
+chpasswd:
+  expire: False
+users:
+  - default
diff --git a/cloud-init-config/meta-data b/cloud-init-config/meta-data
diff --git a/cloud-init-config/user-data b/cloud-init-config/user-data
diff --git a/cloud-init.sh b/cloud-init.sh
@@ -1,5 +1,6 @@
-sudo apt install cloud-image-utils genisoimage
+sudo apt install genisoimage
 
-genisoimage -output seed.iso -volid cidata -joliet -rock user-data meta-data
-
-# genisoimage -output seed.iso -volid cidata -joliet -rock user-data meta-data network-config
+genisoimage -output blobs/seed.iso -volid cidata -joliet -rock \
+  ci-config/user-data \
+  ci-config/meta-data \
+  ci-config/network-config
diff --git a/compose.yaml b/compose.yaml
@@ -0,0 +1,20 @@
+# TODO: remove privileged: /dev/kvm, /dev/net/tun, NET_ADMIN
+# IDEA: may be need 2 networks
+
+services:
+  runtime:
+    container_name: runtime
+    image: devmachines/runtime
+    volumes:
+      - ./blobs:/blobs
+      - image:/image:ro
+    command: sleep infinity
+    privileged: true
+
+  ubuntu:
+    image: devmachines/ubuntu
+    volumes:
+      - image:/image
+
+volumes:
+  image: {}
diff --git a/deprecated/create-vm-disk.sh b/deprecated/create-vm-disk.sh
@@ -0,0 +1 @@
+qemu-img create -b ./vm-disk.img.orig -F qcow2 -f qcow2 myimage.img 10G
diff --git a/deprecated/qemu-user-net.sh b/deprecated/qemu-user-net.sh
@@ -0,0 +1,2 @@
+# -netdev tap,id=net0,ifname=tap0,script=no,downscript=no \
+# -netdev user,id=net0,hostfwd=tcp::2222-:22 \
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -0,0 +1,13 @@
+group "default" {
+    targets = ["runtime", "ubuntu"]
+}
+
+target "runtime" {
+    dockerfile = "runtime.Dockerfile"
+    tags = ["devmachines/runtime"]
+}
+
+target "ubuntu" {
+    dockerfile = "ubuntu.Dockerfile"
+    tags = ["devmachines/ubuntu"]
+}
diff --git a/get-image.sh b/get-image.sh
@@ -1 +1,2 @@
-wget https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64-disk-kvm.img
+wget -O ./images/ubuntu.img \
+ https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64-disk-kvm.img 
diff --git a/runtime.Dockerfile b/runtime.Dockerfile
@@ -0,0 +1,5 @@
+# TODO: Add start script
+
+FROM alpine
+
+RUN apk add qemu-system-x86_64 qemu-img iproute2
diff --git a/start.sh b/start.sh
@@ -1,13 +1,27 @@
-docker run --name qemu -it --privileged --mount type=bind,source="$(pwd)"/blobs,target=/blobs alpine
+# TODO: Add dynamic disk generation if not exists
+qemu-img create -b /image/ubuntu.img -F qcow2 -f qcow2 /blobs/disk.img 10G
 
-apk add qemu-system-x86_64
+ip link add name br0 type bridge
+ip link set dev br0 up
 
+ip link set eth0 master br0
+ip link set dev eth0 up
+
+ip tuntap add dev tap0 mode tap
+ip link set tap0 master br0
+ip link set tap0 up
+
+# TODO: Add dynamic adress resolution
+ip addr del 172.20.0.2/16 dev eth0
+
+# TODO: Add params selection from env variables
+# TODO: Add dynamic seed.iso generation
 qemu-system-x86_64 \
   -m 2048 \
   -smp 2 \
   -enable-kvm \
-  -drive file=/blobs/vm-disk.img,format=qcow2,if=virtio \
+  -drive file=/blobs/disk.img,format=qcow2,if=virtio \
   -drive file=/blobs/seed.iso,format=raw,if=virtio \
-  -netdev user,id=net0,hostfwd=tcp::2222-:22 \
+  -netdev tap,id=net0,ifname=tap0,script=no,downscript=no \
   -device virtio-net-pci,netdev=net0 \
   -nographic
diff --git a/ubuntu.Dockerfile b/ubuntu.Dockerfile
@@ -0,0 +1,5 @@
+FROM scratch
+
+WORKDIR /image
+
+COPY images/ubuntu.img .

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+instance-id: iid-local1`
	`2`	`+local-hostname: my-vm`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+qemu-img create -b ./vm-disk.img.orig -F qcow2 -f qcow2 myimage.img 10G`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# -netdev tap,id=net0,ifname=tap0,script=no,downscript=no \`
	`2`	`+# -netdev user,id=net0,hostfwd=tcp::2222-:22 \`