summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorJohannes Wienke <languitar@semipol.de>2021-04-08 14:49:14 +0200
committerGitHub <noreply@github.com>2021-04-08 13:49:14 +0100
commitcb657eb2f85b29fc8e6ea7b692677ec63d76472b (patch)
treeb06ad39c9db95f45bb8f712fe1d7129d6bf7f74b /docker
parentMSC3083: Check for space membership during a local join of restricted rooms. ... (diff)
downloadsynapse-cb657eb2f85b29fc8e6ea7b692677ec63d76472b.tar.xz
Put opencontainers labels to the final image (#9765)
They don't make any sense on the intermediate builder image. The final
images needs them to be of use for anyone.

Signed-off-by: Johannes Wienke <languitar@semipol.de>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile10
1 files changed, 5 insertions, 5 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile

index 5b7bf02776..4f5cd06d72 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile
@@ -18,11 +18,6 @@ ARG PYTHON_VERSION=3.8 ### FROM docker.io/python:${PYTHON_VERSION}-slim as builder -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' -LABEL org.opencontainers.image.source='https://github.com/matrix-org/synapse.git' -LABEL org.opencontainers.image.licenses='Apache-2.0' - # install the OS build deps RUN apt-get update && apt-get install -y \ build-essential \ @@ -66,6 +61,11 @@ RUN pip install --prefix="/install" --no-deps --no-warn-script-location /synapse 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' +LABEL org.opencontainers.image.source='https://github.com/matrix-org/synapse.git' +LABEL org.opencontainers.image.licenses='Apache-2.0' + RUN apt-get update && apt-get install -y \ curl \ gosu \