From aca156f21b8e255165b99c5fd8fd53ee6137a1ba Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Tue, 14 Nov 2017 12:35:33 +0000 Subject: [PATCH] Update to released shared-memory-ring --- Dockerfile | 5 ++--- config.ml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3cf30c..211f42e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,12 +7,11 @@ FROM ocaml/opam@sha256:17143ad95a2e944758fd9de6ee831e9af98367455cd273b17139c38dc # Pin last known-good version for reproducible builds. # Remove this line (and the base image pin above) if you want to test with the # latest versions. -RUN cd opam-repository && git reset --hard 26fc7c2d5eb5041b7348e28e8300d376a1c31a62 && opam update +RUN cd opam-repository && git fetch origin && git reset --hard 67ab04a9a142da70935c9fdf919bf09b517499c9 && opam update RUN sudo apt-get install -y m4 libxen-dev -# TODO: remove this once the new versions are released (smr>2.0.1 and mnx>1.7.1) +# TODO: remove this once the new versions are released (mnx>1.7.1) RUN opam pin add -yn --dev netchannel -RUN opam pin add -yn --dev shared-memory-ring RUN opam install -y vchan xen-gnt mirage-xen-ocaml mirage-xen-minios io-page mirage-xen mirage mirage-nat mirage-qubes RUN mkdir /home/opam/qubes-mirage-firewall ADD config.ml /home/opam/qubes-mirage-firewall/config.ml diff --git a/config.ml b/config.ml index 0a73b48..8fb088e 100644 --- a/config.ml +++ b/config.ml @@ -21,6 +21,7 @@ let main = package "vchan"; package "cstruct"; package "tcpip" ~sublibs:["stack-direct"; "xen"; "arpv4"] ~min:"3.1.0"; + package "shared-memory-ring" ~min:"3.0.0"; package "mirage-net-xen"; package "mirage-qubes"; package "mirage-nat";