Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 1e374af

Browse files
committed
Put opencontainers labels to the final image
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 <[email protected]>
1 parent 0d87c6b commit 1e374af

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

changelog.d/9765.docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move opencontainers labels to the final Docker image such that users can inspect them.

docker/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ ARG PYTHON_VERSION=3.8
1818
###
1919
FROM docker.io/python:${PYTHON_VERSION}-slim as builder
2020

21-
LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse'
22-
LABEL org.opencontainers.image.documentation='https://github.com/matrix-org/synapse/blob/master/docker/README.md'
23-
LABEL org.opencontainers.image.source='https://github.com/matrix-org/synapse.git'
24-
LABEL org.opencontainers.image.licenses='Apache-2.0'
25-
2621
# install the OS build deps
2722
RUN apt-get update && apt-get install -y \
2823
build-essential \
@@ -66,6 +61,11 @@ RUN pip install --prefix="/install" --no-deps --no-warn-script-location /synapse
6661

6762
FROM docker.io/python:${PYTHON_VERSION}-slim
6863

64+
LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse'
65+
LABEL org.opencontainers.image.documentation='https://github.com/matrix-org/synapse/blob/master/docker/README.md'
66+
LABEL org.opencontainers.image.source='https://github.com/matrix-org/synapse.git'
67+
LABEL org.opencontainers.image.licenses='Apache-2.0'
68+
6969
RUN apt-get update && apt-get install -y \
7070
curl \
7171
gosu \

0 commit comments

Comments
 (0)