Merge branch 'master' into source

google · Nov 28, 2024 · 9fd44d4 · 9fd44d4
2 parents dce5cbe + 5ef4d66
commit 9fd44d4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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