From cbafbfab3fbf2bee6ff4ea70efb6dfe0740c1caa Mon Sep 17 00:00:00 2001
From: erinhmclark <erinhannahmary.clark@gmail.com>
Date: Fri, 24 Jan 2025 08:04:09 +0000
Subject: [PATCH] Revert Dockerfile changes

---
 Dockerfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8272c73..0ecc7f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM webrecorder/browsertrix-crawler:1.4.2 AS base
+FROM webrecorder/browsertrix-crawler:1.0.4 AS base
 
 ENV RUNNING_IN_DOCKER=1 \
     LANG=C.UTF-8 \
@@ -22,30 +22,28 @@ RUN add-apt-repository ppa:mozillateam/ppa && \
 
 
 # Poetry and runtime
-FROM base AS poetry-env
+FROM base AS runtime
 
 ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     POETRY_VIRTUALENVS_CREATE=1
 
 
-# Create a virtual environment for poetry and install it
-RUN python3 -m venv /poetry-venv && \
-    /poetry-venv/bin/python -m pip install --upgrade pip && \
-    /poetry-venv/bin/python -m pip install "poetry>=2.0.0,<3.0.0"
+RUN pip install --upgrade pip && \
+    pip install "poetry>=2.0.0,<3.0.0"
 
 WORKDIR /app
 
 
 COPY pyproject.toml poetry.lock README.md ./
 # Copy dependency files and install dependencies (excluding the package itself)
-RUN /poetry-venv/bin/poetry install --only main --no-root --no-cache
+RUN poetry install --only main --no-root --no-cache
 
 
 # Copy code: This is needed for poetry to install the package itself,
 # but the environment should be cached from the previous step if toml and lock files haven't changed
 COPY ./src/ .
-RUN /poetry-venv/bin/poetry install --only main --no-cache
+RUN poetry install --only main --no-cache
 
 
 # Update PATH to include virtual environment binaries
@@ -57,3 +55,4 @@ ENTRYPOINT ["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
+