Dockerfile & dependencies updates

MisterDA · MisterDA · commit 6733c4591941 · 2024-10-09T10:45:37.000+02:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,8 @@
-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
+# syntax=docker/dockerfile:1
+FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
+RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libcapnp-dev libffi-dev libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard cf93548ddc4f36b87b006f4858fac7ae73ccaa0f && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
 COPY --chown=opam \
 	ocurrent/current_docker.opam \
 	ocurrent/current_github.opam \
diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
@@ -1,7 +1,8 @@
-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
+# syntax=docker/dockerfile:1
+FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
+RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard cf93548ddc4f36b87b006f4858fac7ae73ccaa0f && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
 COPY --chown=opam \
 	ocurrent/current_docker.opam \
 	ocurrent/current_github.opam \
diff --git a/Dockerfile.web b/Dockerfile.web
@@ -1,7 +1,8 @@
-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
+# syntax=docker/dockerfile:1
+FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
+RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libgmp-dev libssl-dev libffi-dev libsqlite3-dev -y --no-install-recommends
-RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard cf93548ddc4f36b87b006f4858fac7ae73ccaa0f && opam update
+RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
 COPY --chown=opam \
     ocurrent/current_rpc.opam \
     /src/ocurrent/
diff --git a/dune-project b/dune-project
@@ -135,10 +135,10 @@
   (ansi (>= 0.6.0))
   (capnp-rpc-unix (>= 1.2))
   (crunch (and (>= 3.2.0) :build))
-  (dream (= 1.0.0~alpha5))
+  (dream (= 1.0.0~alpha6))
   (fmt (>= 0.8.9))
   (logs (>= 0.7.0))
-  (lwt (>= 5.6.1))
+  (lwt (>= 5.7.0))
   (prometheus-app (>= 1.2))
   (ppx_deriving_yojson (>= 3.7))
   (yojson (>= 2.1))
diff --git a/ocaml-ci-web.opam b/ocaml-ci-web.opam
@@ -44,5 +44,5 @@ build: [
 ]
 dev-repo: "git+https://github.com/ocurrent/ocaml-ci.git"
 pin-depends: [
-  ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
+  ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/e5bb6361a50c7cc5cad802311e609336583ca08f.tar.gz"]
 ]
diff --git a/ocaml-ci-web.opam.template b/ocaml-ci-web.opam.template
@@ -1,3 +1,3 @@
 pin-depends: [
-  ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
+  ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/e5bb6361a50c7cc5cad802311e609336583ca08f.tar.gz"]
 ]
diff --git a/ocaml-dockerfile b/ocaml-dockerfile
@@ -1 +1 @@
-Subproject commit 8961432d1d3b2fb5541f5bb16bfad7d35574b8b7
+Subproject commit a785d6659c9797b9f2211fe9dd2066ece380e891
diff --git a/ocluster b/ocluster
@@ -1 +1 @@
-Subproject commit 912ecfd38f003c6f537abca7e5313973b15ba615
+Subproject commit ba26623c6bca8b917c4252fa9739313fb14692ea
diff --git a/ocurrent b/ocurrent
@@ -1 +1 @@
-Subproject commit e43b6c5c896a4cc5ca5c1d0cfbf10a6401fbcd47
+Subproject commit 575e5cf1a4ade96ea4a5c43c4aa7ae12fc90dde0

Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,5 @@ build: [`
`44`	`44`	`]`
`45`	`45`	`dev-repo: "git+https://github.com/ocurrent/ocaml-ci.git"`
`46`	`46`	`pin-depends: [`
`47`		`- ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]`
	`47`	`+ ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/e5bb6361a50c7cc5cad802311e609336583ca08f.tar.gz"]`
`48`	`48`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`pin-depends: [`
`2`		`- ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]`
	`2`	`+ ["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/e5bb6361a50c7cc5cad802311e609336583ca08f.tar.gz"]`
`3`	`3`	`]`