From 9acf31d6ec3de6098c3b10591472137fdcf50304 Mon Sep 17 00:00:00 2001
From: james-choncholas <jim@choncholas.com>
Date: Fri, 29 Mar 2024 12:22:02 -0400
Subject: [PATCH] Fix issues with experimental evaluation. (thank you anon
 reviewer!)

1. Dockerfile requires noninteractive when installing sudo.
2. eth3d dataset directory is mapped into the container.
---
 .dockerignore     | 1 +
 README.md         | 6 ++++--
 docker/Dockerfile | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 3f102d8..ec01144 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,4 @@ docker/
 plottertest/
 results/
 results-paper/
+data-eth3d/
diff --git a/README.md b/README.md
index 7656b48..65078c4 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,9 @@ intermediate ciphertext stored as secret share.
 ## Experimental Evaluation
 First, download the
 [eth3d dataset](https://www.eth3d.net/datasets#high-res-multi-view) with the
-following commands. These will specifically download the high-res multi-view
-undistorted images and ground truth scan evaluation from eth3d.
+following commands on the host (outside the container). These will specifically
+download the high-res multi-view undistorted images and ground truth scan
+evaluation from eth3d.
 ```bash
 sudo apt-get install p7zip-full
 mkdir ./data-eth3d
@@ -69,6 +70,7 @@ mkdir -p results
 docker run -it --rm --init \
   --net=host \
   --name snail-tester \
+  --volume "$(pwd)/data-eth3d":/snail/data-eth3d \
   --volume "$(pwd)/results":/snail/results \
   snail-server bash
 ```
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 846dbc6..1a13b70 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:22.04
 
-RUN apt update && apt upgrade -y && apt install -y sudo
+RUN apt update && apt upgrade -y && DEBIAN_FRONTEND=noninteractive apt install -y sudo
 RUN DEBIAN_FRONTEND=noninteractive apt install -y g++ make cmake libgmp-dev libssl-dev libboost-all-dev
 
 RUN DEBIAN_FRONTEND=noninteractive apt install -y software-properties-common cmake git build-essential libssl-dev xxd