From d36ecf96af37154ca050b0de2e1c445f41f603a2 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 15 Jun 2019 12:48:01 +0100 Subject: [PATCH] Remove cmdliner pin as 1.0.4 is now released Reverts 06511e076f --- Dockerfile | 5 ++--- build-with-docker.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cbe558..41ad029 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,14 @@ # It will probably still work on newer images, though, unless Debian # changes some compiler optimisations (unlikely). #FROM ocaml/opam2:debian-9-ocaml-4.07 -FROM ocaml/opam2@sha256:f7125924dd6632099ff98b2505536fe5f5c36bf0beb24779431bb62be5748562 +FROM ocaml/opam2@sha256:74fb6e30a95e1569db755b3c061970a8270dfc281c4e69bffe2cf9905d356b38 # 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 git fetch origin && git reset --hard d1b2a1cbc28d43926b37e61f46fc403b48ab9c23 && opam update +RUN git fetch origin && git reset --hard d28fedaa8a077a429bd7bd79cbc19eb90e01c040 && opam update RUN sudo apt-get install -y m4 libxen-dev pkg-config -RUN opam pin add -yn cmdliner 'https://github.com/talex5/cmdliner.git#repro-builds' RUN opam install -y vchan 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/build-with-docker.sh b/build-with-docker.sh index 701c686..b484c2f 100755 --- a/build-with-docker.sh +++ b/build-with-docker.sh @@ -5,5 +5,5 @@ docker build -t qubes-mirage-firewall . echo Building 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 last known: 5ee982b12fb3964e7d9e32ca74ce377ec068b3bbef2b6c86c131f8bb422a3134" +echo "SHA2 last known: b4758e0911acd25c278c5d4bb9feb05daccb5e3d6c3692b5e2274b098971e1b8" echo "(hashes should match for released versions)"