From 0fab0b233149cf6f7fa6507f24d323569bc4d23b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= <reynir@reynir.dk>
Date: Fri, 9 Sep 2022 12:02:26 +0200
Subject: [PATCH] Update to new unipi/mirage4

---
 Dockerfile                      | 12 ++++++---
 mirage-unikernel-unipi-spt.opam | 47 ---------------------------------
 2 files changed, 8 insertions(+), 51 deletions(-)
 delete mode 100644 mirage-unikernel-unipi-spt.opam

diff --git a/Dockerfile b/Dockerfile
index 6af2184..bbcc541 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,14 @@
 FROM ocaml/opam:ubuntu-20.04-ocaml-4.14 AS opam
-COPY mirage-unikernel-unipi-spt.opam /home/opam/opam-repository/packages/mirage-unikernel-unipi-spt/mirage-unikernel-unipi-spt.0.0.1~dev/opam
-RUN sudo apt update && opam update && opam depext mirage-unikernel-unipi-spt && opam install mirage-unikernel-unipi-spt
-RUN bindir="$(opam config var bin)"; cp $bindir/unipi.spt $bindir/solo5-elftool $bindir/solo5-spt .
+RUN sudo cp /usr/bin/opam-2.1 /usr/local/bin/opam
+RUN sudo apt update && opam update && \
+    opam install 'mirage>4' && \
+    eval $(opam env) && \
+    git clone https://github.com/roburio/unipi.git && \
+    ( cd unipi && mirage configure -t spt && make ) && \
+    { bindir="$(opam var bin)"; cp $bindir/solo5-elftool $bindir/solo5-spt ~/; }
 
 FROM ubuntu:20.04
-COPY --from=opam /home/opam/unipi.spt /unipi.spt
+COPY --from=opam /home/opam/unipi/dist/unipi.spt /unipi.spt
 COPY --from=opam /home/opam/solo5-elftool /home/opam/solo5-spt /usr/local/bin/
 COPY entrypoint.sh /entrypoint.sh
 RUN apt update && apt install -y iproute2
diff --git a/mirage-unikernel-unipi-spt.opam b/mirage-unikernel-unipi-spt.opam
deleted file mode 100644
index 93b5712..0000000
--- a/mirage-unikernel-unipi-spt.opam
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by _build/default/config.exe configure -t spt (2022-07-22 19:38:43-00:00).
-opam-version: "2.0"
-name: "mirage-unikernel-unipi-spt"
-depends: [ "arp" { >= "3.0.0" & < "4.0.0"}
-           "awa" 
-           "awa-mirage" 
-           "ethernet" { >= "3.0.0" & < "4.0.0"}
-           "functoria-runtime" 
-           "git" { >= "3.7.0"}
-           "git-mirage" { >= "3.7.0" & < "3.8.0"}
-           "git-paf" { >= "3.7.0"}
-           "irmin-mirage-git" { >= "2.10.0" & < "3.0.0"}
-           "letsencrypt" { >= "0.3.0"}
-           "logs" 
-           "lwt" 
-           "magic-mime" 
-           "mimic" 
-           "mirage" {build &  >= "3.10.0" & < "3.11.0"}
-           "mirage-bootvar-solo5" { >= "0.6.0" & < "0.7.0"}
-           "mirage-clock-freestanding" { >= "3.0.0" & < "5.0.0"}
-           "mirage-crypto-rng-mirage" { >= "0.8.0" & < "0.11.0"}
-           "mirage-logs" { >= "1.2.0" & < "2.0.0"}
-           "mirage-net-solo5" { >= "0.6.1" & < "0.7.0"}
-           "mirage-runtime" { >= "3.10.0" & < "3.11.0"}
-           "mirage-solo5" { >= "0.6.1" & < "0.7.0"}
-           "mirage-types" { >= "3.10.0" & < "3.11.0"}
-           "mirage-types-lwt" { >= "3.10.0" & < "3.11.0"}
-           "ocaml" {build &  >= "4.08.0"}
-           "ocamlbuild" {build}
-           "ocamlfind" {build}
-           "paf" { >= "0.0.8-1" & < "0.0.9"}
-           "paf-le" { >= "0.0.8-1" & < "0.0.9"}
-           "solo5-bindings-spt" { >= "0.6.0" & < "0.7.0"}
-           "tcpip" { >= "7.0.0" & < "8.0.0"}
-           "tls-mirage" 
-]
-maintainer: "dummy"
-authors: "dummy"
-homepage: "dummy"
-bug-reports: "dummy"
-dev-repo: "git+https://example.com/nonexistent"
-build: [ "sh" "-exc" "mirage configure -t spt && mirage build" ]
-synopsis: "This is a dummy"
-install: [
-  [ "cp" "unipi.spt" "%{bin}%/unipi.spt" ]
-]
-url { src: "git+https://github.com/roburio/unipi.git#main" }