Switch vm-manager to git dep + multi-stage Containerfile

- Use HTTPS git dep for vm-manager (works in CI and container builds)
- Add .cargo/ to .gitignore (local dev patch override)
- Restore multi-stage Containerfile: Rust build stage fetches vm-manager
  from GitHub, Ubuntu 24.04 runtime with QEMU
- Host orchestrator stopped and disabled (container-only from now on)
This commit is contained in:
Till Wegmueller 2026-04-07 17:16:02 +02:00
parent 21f4977839
commit b5c7078adc
3 changed files with 26 additions and 8 deletions

3
.gitignore vendored
View file

@ -104,3 +104,6 @@ Cargo.lock
rust-project.json rust-project.json
# Local cargo config (dev overrides for vm-manager path dep)
.cargo/

View file

@ -8,7 +8,7 @@ build = "build.rs"
[dependencies] [dependencies]
common = { path = "../common" } common = { path = "../common" }
vm-manager = { path = "../../../vm-manager/crates/vm-manager" } vm-manager = { git = "https://github.com/CloudNebulaProject/vm-manager.git", branch = "main" }
clap = { version = "4", features = ["derive", "env"] } clap = { version = "4", features = ["derive", "env"] }
miette = { version = "7", features = ["fancy"] } miette = { version = "7", features = ["fancy"] }
thiserror = "1" thiserror = "1"

View file

@ -1,10 +1,26 @@
# syntax=docker/dockerfile:1.7 # syntax=docker/dockerfile:1.7
# Solstice Orchestrator container # Build Solstice Orchestrator
# Uses vm-manager (direct QEMU) instead of libvirt — only needs /dev/kvm at runtime # Uses vm-manager (direct QEMU) instead of libvirt — only needs /dev/kvm at runtime
#
# Pre-build the binary, then build the container: FROM docker.io/library/rust:bookworm AS builder
# cargo build --release -p orchestrator ENV CARGO_HOME=/cargo
# docker build -f deploy/images/orchestrator/Containerfile -t local/solstice-orchestrator:latest . WORKDIR /work
# Install build dependencies: protoc, DB headers, pkg-config
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
protobuf-compiler libprotobuf-dev pkg-config libsqlite3-dev libpq-dev ca-certificates \
&& rm -rf /var/lib/apt/lists/*
# Configure cargo target-dir so it can be cached between layers
RUN mkdir -p /cargo && printf "[build]\ntarget-dir = \"/cargo/target\"\n" > /cargo/config.toml
# Copy source
COPY Cargo.toml Cargo.lock ./
COPY crates ./crates
# Build orchestrator (vm-manager fetched as git dep from GitHub)
RUN --mount=type=cache,target=/cargo/registry,sharing=locked \
--mount=type=cache,target=/cargo/git,sharing=locked \
--mount=type=cache,target=/cargo/target,sharing=locked \
cargo build --release -p orchestrator \
&& cp /cargo/target/release/orchestrator /orchestrator
FROM docker.io/library/ubuntu:24.04 FROM docker.io/library/ubuntu:24.04
# Runtime: QEMU for VMs, qemu-utils for qemu-img, DB client libs # Runtime: QEMU for VMs, qemu-utils for qemu-img, DB client libs
@ -13,7 +29,6 @@ RUN apt-get update \
libsqlite3-0 libpq5 ca-certificates \ libsqlite3-0 libpq5 ca-certificates \
qemu-system-x86 qemu-utils \ qemu-system-x86 qemu-utils \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY target/release/orchestrator /usr/local/bin/solstice-orchestrator COPY --from=builder /orchestrator /usr/local/bin/solstice-orchestrator
RUN chmod +x /usr/local/bin/solstice-orchestrator
EXPOSE 8081 EXPOSE 8081
ENTRYPOINT ["/usr/local/bin/solstice-orchestrator"] ENTRYPOINT ["/usr/local/bin/solstice-orchestrator"]