From 60b779a9059dbd274b336a27f9a6b6db0bde53fd Mon Sep 17 00:00:00 2001
From: Alastair D'Silva <alastair@d-silva.org>
Date: Mon, 17 Apr 2023 17:09:13 +1000
Subject: [PATCH] Remove requirements-docker.txt

This file needs to be maintained parallel to requirements.txt, but
isn't, causes problems when new dependencies are introduced.

Instead, derive the Docker dependencies from the stock ones.

Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
---
 Dockerfile              |  5 +++--
 requirements-docker.txt | 28 ----------------------------
 requirements.txt        |  2 ++
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 requirements-docker.txt

diff --git a/Dockerfile b/Dockerfile
index 9886d74266f2..5219e7d11495 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,9 @@ RUN chown appuser:appuser /home/appuser
 USER appuser
 
 # Copy the requirements.txt file and install the requirements
-COPY --chown=appuser:appuser requirements-docker.txt .
-RUN pip install --no-cache-dir --user -r requirements-docker.txt
+COPY --chown=appuser:appuser requirements.txt .
+RUN sed -i '/Items below this point will not be included in the Docker Image/,$d' requirements.txt && \
+	pip install --no-cache-dir --user -r requirements.txt
 
 # Copy the application files
 COPY --chown=appuser:appuser autogpt/ ./autogpt
diff --git a/requirements-docker.txt b/requirements-docker.txt
deleted file mode 100644
index a6018f8f9f4e..000000000000
--- a/requirements-docker.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-beautifulsoup4
-colorama==0.4.6
-openai==0.27.2
-playsound==1.2.2
-python-dotenv==1.0.0
-pyyaml==6.0
-readability-lxml==0.8.1
-requests
-tiktoken==0.3.3
-gTTS==2.3.1
-docker
-duckduckgo-search
-google-api-python-client #(https://developers.google.com/custom-search/v1/overview)
-pinecone-client==2.2.1
-redis
-orjson
-Pillow
-selenium
-webdriver-manager
-coverage
-flake8
-numpy
-pre-commit
-black
-isort
-gitpython==3.1.31
-tweepy
-jsonschema
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 843b66bfe454..3f1eee5b7da3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -30,6 +30,8 @@ sourcery
 isort
 gitpython==3.1.31
 
+# Items below this point will not be included in the Docker Image
+
 # Testing dependencies
 pytest
 asynctest