From c7dd32ccccdd35768a64129ed2990ca987a7ee37 Mon Sep 17 00:00:00 2001
From: Lane Goodman <Lane@developmentseed.org>
Date: Thu, 8 Dec 2022 16:39:27 -0500
Subject: [PATCH 1/2] Update dockerfile and requirements to pin versions

---
 Dockerfile.cpu   | 6 +++---
 requirements.txt | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.cpu b/Dockerfile.cpu
index 118909e..9b1e8bf 100644
--- a/Dockerfile.cpu
+++ b/Dockerfile.cpu
@@ -1,5 +1,5 @@
 # https://github.com/plippe/faiss-docker/blob/master/Dockerfile
-FROM nvidia/cuda:8.0-devel-ubuntu16.04
+FROM --platform=linux/amd64 nvidia/cuda:11.8.0-devel-ubuntu22.04
 
 ENV FAISS_CPU_OR_GPU "cpu"
 ENV FAISS_VERSION "1.3.0"
@@ -7,7 +7,7 @@ ENV OPENCV_VERSION "3.4.8"
 
 RUN apt-get update && apt-get install -y curl bzip2 libgl1-mesa-glx
 
-RUN curl https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh > /tmp/conda.sh
+RUN curl -L https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh > /tmp/conda.sh
 RUN bash /tmp/conda.sh -b -p /opt/conda && \
     /opt/conda/bin/conda update -n base conda && \
     /opt/conda/bin/conda install -y -c pytorch faiss-${FAISS_CPU_OR_GPU}=${FAISS_VERSION} && \
@@ -38,7 +38,7 @@ RUN apt-get update -y && \
         libpq-dev \
         libopenblas-dev \
         liblapack3 \
-        python-dev \
+        python2-dev \
         swig \
         git \
         python-pip \
diff --git a/requirements.txt b/requirements.txt
index b86bdb3..821b9c8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,5 @@ scikit-image==0.14.0
 moviepy==0.2.3.5
 tqdm==4.26.0
 dlib
-imutils
\ No newline at end of file
+imutils==0.5.3
+imageio<2.7
\ No newline at end of file

From a1ed3060f6ce80f14fa2f18a1edde4c0ad98413f Mon Sep 17 00:00:00 2001
From: Lane Goodman <Lane@developmentseed.org>
Date: Thu, 8 Dec 2022 17:02:20 -0500
Subject: [PATCH 2/2] Remove local dropbox reference

---
 launch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/launch.sh b/launch.sh
index cb859ea..238cb5a 100644
--- a/launch.sh
+++ b/launch.sh
@@ -12,7 +12,7 @@ docker run \
 	--rm \
 	--name $CONTAINER_NAME \
 	--mount type=bind,source="$(pwd)",target=/project \
-	--mount type=bind,source="$HOME/Dropbox/Camera Uploads/",target=/pics \
+	--mount type=bind,source="$HOME/",target=/pics \
 	-p "$PORT:$PORT/tcp" \
 	-e "DISPLAY=$IP:0" \
 	mosaic-conda:latest \