From 319bc7e9cdd9b2170c4a7ab2e0bd227d15b02f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Donncha=20=C3=93=20Cearbhaill?=
 <donncha.ocearbhaill@amnesty.org>
Date: Wed, 23 Oct 2024 14:56:35 +0200
Subject: [PATCH] Switch docker build to use local context rather than pulling

---
 .dockerignore      |  2 --
 Dockerfile         | 14 ++++++++------
 Dockerfile.android |  5 +++--
 Dockerfile.ios     |  7 ++++---
 4 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 65b326f..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore everything, the dockerfile always pulls from https://github.com/mvt-project/mvt.git@main
-*
diff --git a/Dockerfile b/Dockerfile
index 97fa5a2..dcc8645 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -131,13 +131,15 @@ COPY --from=build-libusbmuxd /build /
 COPY --from=build-libimobiledevice /build /
 COPY --from=build-usbmuxd /build /
 
-# Install mvt
+# Install mvt using the locally checked out source
+COPY . mvt/
 RUN apt-get update \
-  && apt-get install -y git python3-pip \
-  && PIP_NO_CACHE_DIR=1 pip3 install --upgrade pip \
-  && PIP_NO_CACHE_DIR=1 pip3 install git+https://github.com/mvt-project/mvt.git@main \
-  && apt-get remove -y python3-pip git && apt-get autoremove -y \
-  && rm -rf /var/lib/apt/lists/*
+   && apt-get install -y git python3-pip \
+   && PIP_NO_CACHE_DIR=1 pip3 install --upgrade pip \
+   && PIP_NO_CACHE_DIR=1 pip3 install ./mvt \
+   && apt-get remove -y python3-pip git && apt-get autoremove -y \
+   && rm -rf /var/lib/apt/lists/* \
+   && rm -rf mvt
 
 # Installing ABE
 ADD https://github.com/nelenkov/android-backup-extractor/releases/download/master-20221109063121-8fdfc5e/abe.jar /opt/abe/abe.jar
diff --git a/Dockerfile.android b/Dockerfile.android
index 4d2f0c1..e6cd57f 100644
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -18,9 +18,10 @@ RUN apk add --no-cache \
   sqlite
 
 # Install mvt
+COPY ./ mvt
 RUN apk add --no-cache git \
-  && PIP_NO_CACHE_DIR=1 pip3 install git+https://github.com/mvt-project/mvt.git@main \
-  && apk del git
+  && PIP_NO_CACHE_DIR=1 pip3 install ./mvt \
+  && apk del git && rm -rf ./mvt
 
 # Installing ABE
 ADD https://github.com/nelenkov/android-backup-extractor/releases/download/master-20221109063121-8fdfc5e/abe.jar /opt/abe/abe.jar
diff --git a/Dockerfile.ios b/Dockerfile.ios
index 4d5fb52..a2a29e9 100644
--- a/Dockerfile.ios
+++ b/Dockerfile.ios
@@ -128,9 +128,10 @@ COPY --from=build-libusbmuxd /build /
 COPY --from=build-libimobiledevice /build /
 COPY --from=build-usbmuxd /build /
 
-# Install mvt
+# Install mvt using the locally checked out source
+COPY ./ mvt
 RUN apk add --no-cache git \
-  && PIP_NO_CACHE_DIR=1 pip3 install git+https://github.com/mvt-project/mvt.git@main \
-  && apk del git
+  && PIP_NO_CACHE_DIR=1 pip3 install ./mvt \
+  && apk del git && rm -rf ./mvt
 
 ENTRYPOINT [ "/usr/local/bin/mvt-ios" ]