Wrap container-image fetch eio with run_eio

quantifyearth · Mar 29, 2024 · 7bcbe32 · 7bcbe32
1 parent 3d4e307
commit 7bcbe32
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/container_image_extract.ml b/lib/container_image_extract.ml
@@ -83,7 +83,7 @@ end) = struct
       in
       of_oci_manifest manifest
 
-  let fetch ~log:_ ~rootfs base =
+  let fetch_with_eio ~log:_ ~rootfs base =
     let module Ci = Container_image in
     let open Container_image_spec in
     Logs.info (fun f -> f "Fetching %s" base);
@@ -100,7 +100,10 @@ end) = struct
       let digest = Descriptor.digest descriptor in
       let single_image = Ci.Image.with_digest digest img in 
       Ci.checkout ~only_rootfs:true ~cache ~root single_image;
-      Lwt.return @@ get_environment_variables_from_manifest ~cache manifest img
+      get_environment_variables_from_manifest ~cache manifest img
+
+    let fetch ~log ~rootfs base =
+      Lwt_eio.run_eio @@ fun () -> fetch_with_eio ~log ~rootfs base
 end
 
 let make_fetcher ?(progress=true) ~fs ~net domain_mgr =

diff --git a/lib/dune b/lib/dune
@@ -28,4 +28,4 @@
   (public_name obuilder)
   (preprocess (pps ppx_sexp_conv))
   (flags (:standard -w -69))
-  (libraries fpath lwt lwt.unix fmt yojson tar-unix sexplib sqlite3 astring logs sha obuilder-spec cmdliner extunix container-image xdg))
+  (libraries lwt_eio fpath lwt lwt.unix fmt yojson tar-unix sexplib sqlite3 astring logs sha obuilder-spec cmdliner extunix container-image xdg))