Skip to content

Commit

Permalink
Merge pull request #245 from mtelvers/dockerfile-sha
Browse files Browse the repository at this point in the history
Update base image and opam sha
  • Loading branch information
mtelvers authored May 21, 2024
2 parents 912ecfd + be0460e commit 6fcacb3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
13 changes: 11 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
_build
var
capnp-secrets
**/_build
**/_opam
**/*.swp
**/.git
**/var
**/*.orig
**/*.merlin
**/*.cap
docker-compose.yml
Dockerfile

6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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
Expand Down

0 comments on commit 6fcacb3

Please sign in to comment.