From cc490f9c10d60d056bfc2bdbadd33c50c0342b50 Mon Sep 17 00:00:00 2001
From: erinhmclark <erinhannahmary.clark@gmail.com>
Date: Tue, 7 Jan 2025 20:34:16 +0000
Subject: [PATCH] Updated Dockerfile (not optimised yet)

---
 Dockerfile | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bc76e2b..d7ca54a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,36 @@
 FROM webrecorder/browsertrix-crawler:1.0.4
 
 ENV RUNNING_IN_DOCKER=1
-ENV PATH="/root/.local/bin:$PATH"
+ENV PATH="/usr/local/bin:/root/.local/bin:$PATH"
 
 WORKDIR /app
 
-RUN pip install --upgrade pip && \
-    curl -sSL https://install.python-poetry.org | python3 - --version 1.8.3 && \
-    poetry --version && \
-    add-apt-repository ppa:mozillateam/ppa && \
-    apt-get update && \
-    apt-get install -y gcc ffmpeg fonts-noto exiftool && \
-    apt-get install -y --no-install-recommends firefox-esr && \
+RUN add-apt-repository ppa:mozillateam/ppa && \
+	apt-get update && \
+    apt-get install -y --no-install-recommends gcc ffmpeg fonts-noto exiftool && \
+	apt-get install -y --no-install-recommends firefox-esr && \
     ln -s /usr/bin/firefox-esr /usr/bin/firefox && \
     wget https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz && \
     tar -xvzf geckodriver* -C /usr/local/bin && \
     chmod +x /usr/local/bin/geckodriver && \
-    rm geckodriver-v*
+    rm geckodriver-v* && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
-COPY pyproject.toml poetry.lock ./
+RUN pip install --upgrade pip && \
+    pip install "poetry>=2.0.0"
 
-# Verify Poetry installation and install dependencies
-RUN poetry install --no-root
+COPY pyproject.toml poetry.lock README.md ./
 
 # doing this at the end helps during development, builds are quick
 COPY ./src/ .
 
+# Verify Poetry installation and install dependencies
+RUN poetry install
+
+
 ENTRYPOINT ["poetry", "run", "python3", "-m", "auto_archiver"]
 
+
 # should be executed with 2 volumes (3 if local_storage is used)
 # docker run --rm -v $PWD/secrets:/app/secrets -v $PWD/local_archive:/app/local_archive aa pipenv run python3 -m auto_archiver --config secrets/orchestration.yaml