diff options
| author | David Robertson <davidr@element.io> | 2022-04-14 10:42:57 +0100 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2022-04-14 10:42:57 +0100 |
| commit | 988ff6167d7e2e0da3ed7b7fa009853a42542ece (patch) | |
| tree | c28b44617bbbe822f00bff09791dbf009d578a5a /docker/Dockerfile | |
| parent | Merge remote-tracking branch 'origin/develop' into dmr/pyproject-poetry (diff) | |
| download | synapse-988ff6167d7e2e0da3ed7b7fa009853a42542ece.tar.xz | |
Include some dockerfile changes from develop
I think these may have been retained in merge confusion.
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index da2e48b67d..eff210a261 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -107,7 +107,7 @@ RUN pip install --prefix="/install" --no-deps --no-warn-script-location /synapse ### Stage 2: runtime ### -FROM base +FROM docker.io/python:${PYTHON_VERSION}-slim LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse' LABEL org.opencontainers.image.documentation='https://github.com/matrix-org/synapse/blob/master/docker/README.md' @@ -129,7 +129,7 @@ RUN \ openssl \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /synapse/ /synapse +COPY --from=builder /install /usr/local COPY ./docker/start.py /start.py COPY ./docker/conf /conf |