diff options
| author | Johannes Wienke <languitar@semipol.de> | 2021-04-08 14:49:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-08 13:49:14 +0100 |
| commit | cb657eb2f85b29fc8e6ea7b692677ec63d76472b (patch) | |
| tree | b06ad39c9db95f45bb8f712fe1d7129d6bf7f74b | |
| parent | MSC3083: Check for space membership during a local join of restricted rooms. ... (diff) | |
| download | synapse-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 '')
| -rw-r--r-- | changelog.d/9765.docker | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/changelog.d/9765.docker b/changelog.d/9765.docker new file mode 100644 index 0000000000..f170a36714 --- /dev/null +++ b/changelog.d/9765.docker @@ -0,0 +1 @@ +Move opencontainers labels to the final Docker image such that users can inspect them. 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 \ |