Update Dockerfile

Author: moyodiallo

Dockerfile

@@ -1,9 +1,11 @@
 FROM ocaml/opam:debian-12-ocaml-5.1 AS build
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev libzstd-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard b61304c6db353e679a36720d8b914b029d6fbc0c && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard bc52affc41b55ff00c0d3ac9a376538d79695aaf && opam update
 RUN sudo ln -sf /usr/bin/opam-2.1 /usr/bin/opam
+COPY --chown=opam scache/scache.opam /src/scache/
 COPY --chown=opam solver-service.opam solver-service-api.opam /src/
 WORKDIR /src
+RUN opam pin add -yn scache.dev "./scache"
 RUN opam install -y --deps-only .
 ADD --chown=opam . .
 RUN opam exec -- dune build @install

dune

@@ -1 +1,3 @@
-(dirs :standard \ var cache)
+(dirs :standard \ var)
+
+(vendored_dirs scache)

dune-project

@@ -26,6 +26,7 @@
   (lwt_eio (>= 0.5))
   (logs (>= 0.7.0))
   (fmt (>= 0.9.0))
+  sqlite3
   (ocaml-version (>= 3.6.1))
   (solver-service-api (= :version))
   (dune-build-info (>= 3.8.0))

service/git_clone.ml

@@ -28,12 +28,12 @@ module Make (Cache : CacheType) = struct
   let run_rm ?cwd t args =
     Eio.Process.run (Cache.process_mgr t) (rm_command ?cwd args)
 
-let line_opt r =
-  if Eio.Buf_read.at_end_of_input r then None
-  else Some (Eio.Buf_read.line r)
+  let line_opt r =
+    if Eio.Buf_read.at_end_of_input r then None
+    else Some (Eio.Buf_read.line r)
 
-let run_git_line ?cwd t args =
-  Eio.Process.parse_out (Cache.process_mgr t) line_opt (git_command ?cwd args)
+  let run_git_line ?cwd t args =
+    Eio.Process.parse_out (Cache.process_mgr t) line_opt (git_command ?cwd args)
 
   let take_all_opt r =
     if Eio.Buf_read.at_end_of_input r then None
@@ -141,18 +141,18 @@ let run_git_line ?cwd t args =
     let clone_path = repo_url_to_clone_path t repo_url |> Fpath.to_string in
     run_git_lines t ~cwd:clone_path
     @@ "log"
-    :: "--reverse"
-    :: [ "--format=format:%H" ]
+       :: "--reverse"
+       :: [ "--format=format:%H" ]
     |> Option.value ~default:[]
 
   let diff_pkgs t ~repo_url ~new_commit ~old_commit =
     let clone_path = repo_url_to_clone_path t repo_url |> Fpath.to_string in
     run_git_take_all t ~cwd:clone_path
     @@ "diff"
-    :: old_commit
-    :: new_commit
-    :: "--"
-    :: [ "packages" ]
+       :: old_commit
+       :: new_commit
+       :: "--"
+       :: [ "packages" ]
     |> function
     | None -> []
     | Some diff ->

solver-service.opam

@@ -23,6 +23,7 @@ depends: [
   "lwt_eio" {>= "0.5"}
   "logs" {>= "0.7.0"}
   "fmt" {>= "0.9.0"}
+  "sqlite3"
   "ocaml-version" {>= "3.6.1"}
   "solver-service-api" {= version}
   "dune-build-info" {>= "3.8.0"}