From 78e219da8cf5413b5f12b354b0cd46c7635dc324 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Sat, 3 Nov 2018 17:25:40 +0000 Subject: [PATCH] Update Debian base image in Docker build Had stopped working: Err http://security.debian.org/ jessie/updates/main libxenstore3.0 amd64 4.4.1-9+deb8u10 404 Not Found [IP: 128.61.240.73 80] Updated from Debian 8 to Debian 9, and from opam to opam2. --- Dockerfile | 10 +++++----- build-with-docker.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a680fc2..a6b1c52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ # Pin the base image to a specific hash for maximum reproducibility. -# It will probably still work on newer images, though, unless Debian 8 +# It will probably still work on newer images, though, unless Debian # changes some compiler optimisations (unlikely). -#FROM ocaml/opam:debian-8_ocaml-4.04.2 -FROM ocaml/opam@sha256:17143ad95a2e944758fd9de6ee831e9af98367455cd273b17139c38dcb032f09 +#FROM ocaml/opam2:debian-9-ocaml-4.04 +FROM ocaml/opam2@sha256:feebac4b6f9df9ed52ca1fe7266335cb9fdfffbdc0f6ba4f5e8603ece7e8b096 # 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 fetch origin && git reset --hard eb49e10ee78f36c660a1f57aea45f7a6ed932460 && opam update +RUN git fetch origin && git reset --hard 1fa4c078f5b145bd4a455eb0a5559f761d0a94c0 && opam update -RUN sudo apt-get install -y m4 libxen-dev +RUN sudo apt-get install -y m4 libxen-dev pkg-config 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/build-with-docker.sh b/build-with-docker.sh index c7858c0..76b6a97 100755 --- a/build-with-docker.sh +++ b/build-with-docker.sh @@ -5,4 +5,4 @@ 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: dc0e1e614e113b4e0d4fbd71e90d0489b3fc26a64cd1fbd0df8a56499dfa9a45" +echo "SHA2 last known: dbc245bc425537082e64cf4b4822ce300ddeab10a272a009881e0bd22e06455a"