Merge pull request #45 from moyodiallo/update-dockerfile

Upgrade Dockerfile to debian-12
ocurrent · Oct 11, 2023 · 5271cb3 · 5271cb3
2 parents 68f09ca + 7643a9b
commit 5271cb3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5ce947a2707d3cfe0d2a8918ef41c8b5f88ccddfcace11871c5f553afac189ed AS build
+FROM ocaml/opam:debian-12-ocaml-4.14@sha256:45b04e2a4c933c57549382045dfac12cb7e872cace0456f92f4b022066e48111 AS build
 RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto graphviz m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
 RUN cd ~/opam-repository && git pull origin master && git reset --hard 030450cdf268a0cf6cbe6f3d309dd320345b40c0 && opam update
@@ -8,10 +8,10 @@ RUN opam install -y --deps-only .
 ADD --chown=opam . .
 RUN --mount=type=cache,target=./_build/,uid=1000,gid=1000 opam config exec -- dune build ./_build/install/default/bin/mirage-ci ./_build/install/default/bin/mirage-ci-solver && cp ./_build/install/default/bin/mirage-ci ./_build/install/default/bin/mirage-ci-solver .
 
-FROM debian:11
+FROM debian:12
 RUN apt-get update && apt-get install libev4 openssh-client curl gnupg2 dumb-init git graphviz libsqlite3-dev ca-certificates netbase gzip bzip2 xz-utils unzip tar -y --no-install-recommends
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
-RUN echo 'deb [arch=amd64] https://download.docker.com/linux/debian buster stable' >> /etc/apt/sources.list
+RUN echo 'deb [arch=amd64] https://download.docker.com/linux/debian bookworm stable' >> /etc/apt/sources.list
 RUN apt-get update && apt-get install docker-ce docker-buildx-plugin -y --no-install-recommends
 RUN git config --global user.name "mirage" && git config --global user.email "ci"
 WORKDIR /var/lib/ocurrent

diff --git a/dune-project b/dune-project
@@ -40,6 +40,7 @@
   current_git
   current_github
   (current_ocluster (>= 0.2))
+  (ocluster-api (>= 0.2))
   current_rpc
   current_docker
   current-web-pipelines

diff --git a/mirage-ci.opam b/mirage-ci.opam
@@ -46,6 +46,7 @@ depends: [
   "current_git"
   "current_github"
   "current_ocluster" {>= "0.2"}
+  "ocluster-api" {>= "0.2"}
   "current_rpc"
   "current_docker"
   "current-web-pipelines"

diff --git a/src/mirage_ci.ml b/src/mirage_ci.ml
@@ -55,7 +55,8 @@ let main current_config github mode auth config
         let state =
           let state_active =
             Current_web_pipelines.Task.state prs
-            |> Current.map (List.map (fun v -> v.Current_web_pipelines.State.metadata) )
+            |> Current.map
+                 (List.map (fun v -> v.Current_web_pipelines.State.metadata))
             |> Website.set_active_sources website
           in
           let input = Current_web_pipelines.Task.state prs in
@@ -70,7 +71,8 @@ let main current_config github mode auth config
             end)
             (Website.update_state website)
             input
-          |> Current.pair state_active |> Current.map ignore
+          |> Current.pair state_active
+          |> Current.map ignore
           |> Current.collapse ~key:"current-web-pipeline-internals" ~value:""
                ~input:
                  (Current.return ~label:"current-web-pipelines internals" ())

diff --git a/src/mirage_ci_local.ml b/src/mirage_ci_local.ml
@@ -31,7 +31,8 @@ let main current_config mode config
         let state =
           let state_active =
             Current_web_pipelines.Task.state main_ci
-            |> Current.map (List.map (fun v -> v.Current_web_pipelines.State.metadata) )
+            |> Current.map
+                 (List.map (fun v -> v.Current_web_pipelines.State.metadata))
             |> Website.set_active_sources website
           in
           Current.list_iter ~collapse_key:"update-web-state"
@@ -45,7 +46,8 @@ let main current_config mode config
             end)
             (Website.update_state website)
             (Current_web_pipelines.Task.state main_ci)
-          |> Current.pair state_active |> Current.map ignore
+          |> Current.pair state_active
+          |> Current.map ignore
         in
         [ ("mirage-main-ci", current); ("mirage-state", state) ]
         |> Current.all_labelled)