From 7e4abc7baaa17bdd05193e4fee6a71f0d56998e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= <reynir@reynir.dk>
Date: Sat, 23 Jul 2022 12:13:56 +0200
Subject: [PATCH] Dockerfile: use fewer steps, trace entrypoint.sh

---
 Dockerfile    | 7 ++-----
 entrypoint.sh | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 35078a5..76c0a82 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,14 +3,11 @@ COPY mirage-unikernel-unipi-spt.opam /home/opam/opam-repository/packages/mirage-
 RUN opam update
 RUN opam depext mirage-unikernel-unipi-spt
 RUN opam install mirage-unikernel-unipi-spt
-RUN cp $(opam config var bin)/unipi.spt .
-RUN cp $(opam config var bin)/solo5-elftool .
-RUN cp $(opam config var bin)/solo5-spt .
+RUN bindir="$(opam config var bin)"; cp $bindir/unipi.spt $bindir/solo5-elftool $bindir/solo5-spt .
 
 FROM ubuntu:20.04
 COPY --from=opam /home/opam/unipi.spt /unipi.spt
-COPY --from=opam /home/opam/solo5-elftool /usr/local/bin/solo5-elftool
-COPY --from=opam /home/opam/solo5-spt /usr/local/bin/solo5-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
 EXPOSE 80
diff --git a/entrypoint.sh b/entrypoint.sh
index c2ac54f..835c7f4 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ex
 
 if [ "$#" -lt 1 ]; then
 	echo Must provide the unikernel as argument >&2