Skip to content

Commit

Permalink
Remove requirements-docker.txt
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
deece committed Apr 17, 2023
1 parent f41febd commit 60b779a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 30 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 0 additions & 28 deletions requirements-docker.txt

This file was deleted.

2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

5 comments on commit 60b779a

@mikekelly
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏

@montanaflynn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this re-introduces the issue of sorcery being included, which is causing docker builds to break on apple silicon chips?

#1445

@mikekelly
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@montanaflynn I will fix this right now

@mikekelly
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@montanaflynn fixed here #2339

@montanaflynn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikekelly thanks!

Please sign in to comment.