feat: add start order to docker compose

Author: erlnby

compose.yaml

@@ -1,6 +1,5 @@
 # TODO: remove privileged: /dev/kvm, /dev/net/tun, NET_ADMIN
 # IDEA: may be need 2 networks
-# TODO: Wait until image ready
 
 services:
   runtime:
@@ -9,8 +8,10 @@ services:
     volumes:
       - ./blobs:/blobs
       - image:/image:ro
-    command: sleep infinity
     privileged: true
+    depends_on:
+      ubuntu:
+        condition: service_completed_successfully
 
   ubuntu:
     image: devmachines/ubuntu

main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"log"
 	"os"
 
 	"github.com/utkin-tech/devmachines/cloudinit"
@@ -21,36 +20,38 @@ func main() {
 		os.Exit(1)
 	}
 
-	_, err = disk.SetupDisk(user)
+	diskArgs, err := disk.SetupDisk(user)
 	if err != nil {
-		fmt.Printf("error: %v\n", err)
+		fmt.Printf("failed to setup disk: %v\n", err)
 		os.Exit(1)
 	}
 
-	_, err = cloudinit.SetupCloudInit(net, user)
+	cloudInitArgs, err := cloudinit.SetupCloudInit(net, user)
 	if err != nil {
-		log.Fatal(err)
+		fmt.Printf("failed to setup cloud-init: %v\n", err)
+		os.Exit(1)
 	}
 
-	_, err = network.SetupBridge(net)
+	bridgeArgs, err := network.SetupBridge(net)
 	if err != nil {
-		fmt.Printf("Error setting up network bridge: %v\n", err)
+		fmt.Printf("failed to setup network bridge: %v\n", err)
 		return
 	}
 
-	// config := QEMUConfig{
-	// 	MemoryMB:      2048,
-	// 	CPUCores:      2,
-	// 	DiskImagePath: "/blobs/disk.img",
-	// 	SeedImagePath: "/blobs/seed.iso",
-	// 	TapInterface:  "tap0",
-	// 	Acceleration:  true,
-	// 	Output:        os.Stdout,
-	// 	Wait:          true,
-	// }
-
-	// if err := LaunchQEMUVM(config); err != nil {
-	// 	fmt.Printf("Error launching VM: %v\n", err)
-	// 	os.Exit(1)
-	// }
+	config := QEMUConfig{
+		MemoryMB: 2048,
+		CPUCores: 2,
+		Output:   os.Stdout,
+		Wait:     true,
+	}
+
+	var args []string
+	args = append(args, diskArgs...)
+	args = append(args, cloudInitArgs...)
+	args = append(args, bridgeArgs...)
+
+	if err := StartVM(config, args...); err != nil {
+		fmt.Printf("Error launching VM: %v\n", err)
+		os.Exit(1)
+	}
 }

qemu.go

@@ -6,14 +6,24 @@ import (
 	"os/exec"
 )
 
-func LaunchQEMUVM(config QEMUConfig) error {
+// QEMUConfig holds configuration parameters for the QEMU virtual machine
+type QEMUConfig struct {
+	MemoryMB int       // Memory in megabytes (e.g., 2048)
+	CPUCores int       // Number of CPU cores (e.g., 2)
+	Output   io.Writer // Where to direct output (nil for default)
+	Wait     bool      // Whether to wait for VM to exit
+}
+
+func StartVM(config QEMUConfig, extraArgs ...string) error {
 	args := []string{
 		"-m", fmt.Sprintf("%d", config.MemoryMB),
 		"-smp", fmt.Sprintf("%d", config.CPUCores),
 		"-enable-kvm",
 		"-nographic",
 	}
 
+	args = append(args, extraArgs...)
+
 	cmd := exec.Command("qemu-system-x86_64", args...)
 	cmd.Stdout = config.Output
 	cmd.Stderr = config.Output
@@ -27,13 +37,3 @@ func LaunchQEMUVM(config QEMUConfig) error {
 	}
 	return nil
 }
-
-// QEMUConfig holds configuration parameters for the QEMU virtual machine
-type QEMUConfig struct {
-	MemoryMB      int       // Memory in megabytes (e.g., 2048)
-	CPUCores      int       // Number of CPU cores (e.g., 2)
-	SeedImagePath string    // Path to seed ISO (e.g., "/blobs/seed.iso")
-	TapInterface  string    // Tap interface name (e.g., "tap0")
-	Output        io.Writer // Where to direct output (nil for default)
-	Wait          bool      // Whether to wait for VM to exit
-}

runtime.Dockerfile

@@ -27,3 +27,5 @@ FROM alpine:${ALPINE_VERSION}
 RUN apk add qemu-system-x86_64 qemu-img iproute2 cdrkit
 
 COPY --from=binary /devmachines-runtime /devmachines-runtime
+
+CMD ["/devmachines-runtime"]

ubuntu.Dockerfile

@@ -1,6 +1,7 @@
-FROM scratch
+ARG ALPINE_VERSION="3.20"
+
+FROM alpine:${ALPINE_VERSION}
 
 WORKDIR /image
 
-RUN wget -O ubuntu.img \
-    https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64-disk-kvm.img 
+COPY images/ubuntu.img ubuntu.img