summary refs log tree commit diff
path: root/docker/Dockerfile
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-04-20 17:33:20 +0100
committerGitHub <noreply@github.com>2022-04-20 17:33:20 +0100
commite5a76ec00b443c6e15ac8de2838a5c60a47a67ec (patch)
tree91978252df6c4d27438b21945015f311ace42c2f /docker/Dockerfile
parentFix Jinja templating error when generating thumbnail URLs. (#12510) (diff)
downloadsynapse-e5a76ec00b443c6e15ac8de2838a5c60a47a67ec.tar.xz
Dump setuptools; correct pyproject version number (#12478)
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6f87702cc8..4523c60645 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -59,7 +59,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 WORKDIR /synapse
 
 # Copy just what we need to run `poetry export`...
-COPY pyproject.toml poetry.lock README.rst /synapse/
+COPY pyproject.toml poetry.lock /synapse/
 
 RUN /root/.local/bin/poetry export --extras all -o /synapse/requirements.txt
 
@@ -98,9 +98,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
 # Copy over the rest of the synapse source code.
 COPY synapse /synapse/synapse/
 # ... and what we need to `pip install`.
-# TODO: once pyproject.toml declares poetry-core as its build system, we'll need to copy
-# pyproject.toml here, ditching setup.py and MANIFEST.in.
-COPY setup.py MANIFEST.in README.rst /synapse/
+COPY pyproject.toml README.rst /synapse/
 
 # Install the synapse package itself.
 RUN pip install --prefix="/install" --no-deps --no-warn-script-location /synapse