Update to newly released version of netchannel

This commit is contained in:
Thomas Leonard 2017-12-16 12:37:42 +00:00 committed by Thomas Leonard
parent aca156f21b
commit 6e6ff755eb
3 changed files with 4 additions and 5 deletions

View File

@ -7,11 +7,9 @@ FROM ocaml/opam@sha256:17143ad95a2e944758fd9de6ee831e9af98367455cd273b17139c38dc
# Pin last known-good version for reproducible builds. # Pin last known-good version for reproducible builds.
# Remove this line (and the base image pin above) if you want to test with the # Remove this line (and the base image pin above) if you want to test with the
# latest versions. # latest versions.
RUN cd opam-repository && git fetch origin && git reset --hard 67ab04a9a142da70935c9fdf919bf09b517499c9 && opam update RUN cd opam-repository && git fetch origin && git reset --hard eb49e10ee78f36c660a1f57aea45f7a6ed932460 && opam update
RUN sudo apt-get install -y m4 libxen-dev RUN sudo apt-get install -y m4 libxen-dev
# TODO: remove this once the new versions are released (mnx>1.7.1)
RUN opam pin add -yn --dev netchannel
RUN opam install -y vchan xen-gnt mirage-xen-ocaml mirage-xen-minios io-page mirage-xen mirage mirage-nat mirage-qubes 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 RUN mkdir /home/opam/qubes-mirage-firewall
ADD config.ml /home/opam/qubes-mirage-firewall/config.ml ADD config.ml /home/opam/qubes-mirage-firewall/config.ml

View File

@ -5,4 +5,4 @@ docker build -t qubes-mirage-firewall .
echo Building Firewall... echo Building Firewall...
docker run --rm -i -v `pwd`:/home/opam/qubes-mirage-firewall qubes-mirage-firewall docker run --rm -i -v `pwd`:/home/opam/qubes-mirage-firewall qubes-mirage-firewall
echo "SHA2 of build: $(sha256sum qubes_firewall.xen)" echo "SHA2 of build: $(sha256sum qubes_firewall.xen)"
echo "SHA2 last known: 2cad66c4b83817cdd1650f174586fd4daab7b7c271abd62844de6e6a17200750" echo "SHA2 last known: dc0e1e614e113b4e0d4fbd71e90d0489b3fc26a64cd1fbd0df8a56499dfa9a45"

View File

@ -22,7 +22,8 @@ let main =
package "cstruct"; package "cstruct";
package "tcpip" ~sublibs:["stack-direct"; "xen"; "arpv4"] ~min:"3.1.0"; package "tcpip" ~sublibs:["stack-direct"; "xen"; "arpv4"] ~min:"3.1.0";
package "shared-memory-ring" ~min:"3.0.0"; package "shared-memory-ring" ~min:"3.0.0";
package "mirage-net-xen"; package "netchannel" ~min:"1.8.0";
package "mirage-net-xen" ~min:"1.7.1";
package "mirage-qubes"; package "mirage-qubes";
package "mirage-nat"; package "mirage-nat";
package "mirage-logs"; package "mirage-logs";