diff --git a/.dockerignore b/.dockerignore index c391c54..2df8d89 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,12 @@ -_build -var capnp-secrets +**/_build +**/_opam +**/*.swp +**/.git +**/var +**/*.orig +**/*.merlin +**/*.cap +docker-compose.yml +Dockerfile + diff --git a/Dockerfile b/Dockerfile index c343c3f..8919764 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM ocaml/opam:debian-11-ocaml-4.14@sha256:4bfe3c0814b4220417d6ccbbed7eb5486a35d900024745c1f299973e9584e0e5 AS build +FROM ocaml/opam:debian-12-ocaml-4.14@sha256:650f6b9780c41f4ab594930957aa25012c60114d97638686678eb6979aa7df87 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 76d09264e920a27527de605cc64ef1d28ec353cd && 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/ @@ -13,7 +13,7 @@ RUN opam exec -- dune build \ ./_build/install/default/bin/ocluster-scheduler \ ./_build/install/default/bin/ocluster-admin -FROM debian:11 +FROM debian:12 RUN apt-get update && apt-get install libev4 libsqlite3-0 -y --no-install-recommends RUN apt-get install ca-certificates -y # https://github.com/mirage/ocaml-conduit/issues/388 WORKDIR /var/lib/ocluster-scheduler