From 5ef4d665b4a839fd9e0bfef6655bc067f156f882 Mon Sep 17 00:00:00 2001 From: Michael Kedar Date: Thu, 28 Nov 2024 09:54:08 +1100 Subject: [PATCH] fix: remove setup.py from Docker files (#2929) #2920 didn't remove them from the `COPY`, builds are failing. --- docker/worker/Dockerfile | 2 +- gcp/api/Dockerfile | 2 +- gcp/website/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/worker/Dockerfile b/docker/worker/Dockerfile index 8c5bf36a3f5..0b971dd9ae7 100644 --- a/docker/worker/Dockerfile +++ b/docker/worker/Dockerfile @@ -22,7 +22,7 @@ VOLUME /var/lib/docker # Replicate project structure to make relative editable poetry dependency work. # TODO(ochang): Just copy the entire project (needs a clean checkout). COPY docker/worker/poetry.lock docker/worker/pyproject.toml /env/docker/worker/ -COPY setup.py poetry.lock pyproject.toml README.md /env/ +COPY poetry.lock pyproject.toml README.md /env/ COPY osv /env/osv # Set virtualenv creation to false to install globally diff --git a/gcp/api/Dockerfile b/gcp/api/Dockerfile index 5f08ad539ab..ab5b1021bef 100644 --- a/gcp/api/Dockerfile +++ b/gcp/api/Dockerfile @@ -21,7 +21,7 @@ FROM python:3.11-slim@sha256:ad5dadd957a398226996bc4846e522c39f2a77340b531b28aaa ENV POETRY_VIRTUALENVS_IN_PROJECT=true # TODO(ochang): Just copy the entire project (needs a clean checkout). -COPY setup.py pyproject.toml poetry.lock README.md /osv/ +COPY pyproject.toml poetry.lock README.md /osv/ COPY osv /osv/osv COPY gcp/api /osv/gcp/api diff --git a/gcp/website/Dockerfile b/gcp/website/Dockerfile index 4fdee6109eb..bcedda84b53 100644 --- a/gcp/website/Dockerfile +++ b/gcp/website/Dockerfile @@ -36,7 +36,7 @@ ENV PYTHONUNBUFFERED True WORKDIR /osv/gcp/website # Install Python dependencies -COPY setup.py poetry.lock pyproject.toml README.md /osv/ +COPY poetry.lock pyproject.toml README.md /osv/ COPY osv /osv/osv COPY gcp/website/poetry.lock gcp/website/pyproject.toml ./ RUN pip3 install poetry==1.8.4 && poetry install