Merge pull request #253 from mtelvers/qemu-backend

mtelvers · web-flow · commit 7c2dfdfce022 · 2025-10-15T21:44:36.000+01:00
Updated to include QEMU backend
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ocaml/opam:debian-12-ocaml-4.14@sha256:650f6b9780c41f4ab594930957aa25012c60114d97638686678eb6979aa7df87 AS build
+FROM ocaml/opam:debian-12-ocaml-4.14@sha256:a41e1b0df0a727efab8dfe7860c19c4f4da63bbee905c3f0e975c3f77536ef29 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto libcapnp-dev m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
 RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 76d09264e920a27527de605cc64ef1d28ec353cd && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 5d3f0d1d655199e596a1e785e69fae8fad78cad3 && opam update
 COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
 COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
 RUN opam pin -yn /src/obuilder/
diff --git a/Dockerfile.worker b/Dockerfile.worker
@@ -1,7 +1,7 @@
-FROM ocaml/opam:ubuntu-22.04-ocaml-4.14@sha256:41ce765f59ecde9d8525ec58e0da7cd1317f3798d2c4951186aeef2ce804fad5 AS build
+FROM ocaml/opam:ubuntu-22.04-ocaml-4.14@sha256:7471c0fed839ffc6c3945a7fbe6d1a5cee5a8d7e89189f1ded78d2081bdadacc AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto libcapnp-dev m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
 RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 5d3f0d1d655199e596a1e785e69fae8fad78cad3 && opam update
 COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
 COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
 RUN opam pin -yn /src/obuilder/
@@ -11,7 +11,7 @@ ADD --chown=opam . .
 RUN opam exec -- dune subst
 RUN opam exec -- dune build ./_build/install/default/bin/ocluster-worker
 
-FROM ubuntu:jammy-20221130
+FROM ubuntu:noble
 RUN apt-get update && apt-get install docker.io libev4 curl gnupg2 git libsqlite3-dev ca-certificates netbase -y --no-install-recommends
 WORKDIR /var/lib/ocluster-worker
 ENTRYPOINT ["/usr/local/bin/ocluster-worker"]
diff --git a/Dockerfile.worker.alpine b/Dockerfile.worker.alpine
@@ -1,7 +1,7 @@
-FROM ocaml/opam:alpine-3.17-ocaml-4.14@sha256:df87c00eb4b212b8b42e3cbf37b7729507bb398b4bf19c9df0e2d84d1c41e46d AS build
+FROM ocaml/opam:alpine-ocaml-4.14@sha256:32dde8d3eaad0bcfacc18cd4c9c940d3c75e08b196a878117f84e9c7e500dea6 AS build
 RUN sudo apk update && sudo apk add libev capnproto m4 sqlite libgmpxx
 RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 5d3f0d1d655199e596a1e785e69fae8fad78cad3 && opam update
 COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
 COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
 RUN opam pin -yn /src/obuilder/
@@ -11,7 +11,7 @@ ADD --chown=opam . .
 RUN opam exec -- dune subst
 RUN opam exec -- dune build ./_build/install/default/bin/ocluster-worker
 
-FROM alpine:3.17
+FROM alpine:3.20
 RUN apk update && apk add docker libev curl gnupg git sqlite
 WORKDIR /var/lib/ocluster-worker
 ENTRYPOINT ["/usr/local/bin/ocluster-worker"]
diff --git a/bin/worker.ml b/bin/worker.ml
@@ -185,11 +185,12 @@ module Obuilder_config = struct
     Term.(const Obuilder.Store_spec.to_store $ v)
 
   let v =
-    let make native_conf docker_conf = function
+    let make native_conf docker_conf qemu_conf = function
       | `Native, store -> Some (Cluster_worker.Obuilder_config.v (`Native native_conf) store)
+      | `Qemu, store -> Some (Cluster_worker.Obuilder_config.v (`Qemu qemu_conf) store)
       | `Docker, store -> Some (Cluster_worker.Obuilder_config.v (`Docker docker_conf) store)
     in
-    Term.(const make $ Obuilder.Native_sandbox.cmdliner $ Obuilder.Docker_sandbox.cmdliner $ cmdliner)
+    Term.(const make $ Obuilder.Native_sandbox.cmdliner $ Obuilder.Docker_sandbox.cmdliner $ Obuilder.Qemu_sandbox.cmdliner $ cmdliner)
 end
 
 let worker_opts_t =
diff --git a/obuilder b/obuilder
@@ -1 +1 @@
-Subproject commit bc6eca86e5624b32ca58fb0b5e43e7e15f188f58
+Subproject commit c5f2c487976c3547c0e3abdc0d4a55f34f2af9c1
diff --git a/worker/obuilder_build.ml b/worker/obuilder_build.ml
@@ -6,6 +6,7 @@ module Config = struct
   type t = {
     store : Obuilder.Store_spec.store Lwt.t;
     sandbox_config : [ `Native of Obuilder.Native_sandbox.config
+                     | `Qemu of Obuilder.Qemu_sandbox.config
                      | `Docker of Obuilder.Docker_sandbox.config ]
   }
 
@@ -41,6 +42,11 @@ let create ?(prune_threshold = 30.0) ?(prune_limit = 100) config =
      Obuilder.Native_sandbox.create ~state_dir:(Store.state_dir store / "sandbox") conf >|= fun sandbox ->
      let builder = Builder.v ~store ~sandbox in
      Builder ((module Builder), builder)
+  | `Qemu conf ->
+     let module Builder = Obuilder.Builder (Store) (Obuilder.Qemu_sandbox) (Obuilder.Qemu_snapshot) in
+     Obuilder.Qemu_sandbox.create conf >|= fun sandbox ->
+     let builder = Builder.v ~store ~sandbox in
+     Builder ((module Builder), builder)
   | `Docker conf ->
      let module Builder = Obuilder.Docker_builder (Store) in
      Obuilder.Docker_sandbox.create conf >|= fun sandbox ->
@@ -84,8 +90,9 @@ let build t ~switch ~log ~spec ~src_dir ~secrets =
   (if t.pruning then Lwt_condition.wait t.cond
   else Lwt.return ()) >>= fun () ->
   let log = log_to log in
-  let context = Obuilder.Context.v ~switch ~log ~src_dir ~secrets () in
   let Builder ((module Builder), builder) = t.builder in
+  let shell = Builder.shell builder in
+  let context = Obuilder.Context.v ~switch ~log ~src_dir ?shell ~secrets () in
   Builder.build builder context spec
 
 let healthcheck t =
diff --git a/worker/obuilder_build.mli b/worker/obuilder_build.mli
@@ -4,6 +4,7 @@ module Config : sig
   type t
 
   val v : [ `Native of Obuilder.Native_sandbox.config
+          | `Qemu of Obuilder.Qemu_sandbox.config
           | `Docker of Obuilder.Docker_sandbox.config ]
           -> Obuilder.Store_spec.store Lwt.t -> t
 end
