]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
container: add label ceph=True back 61511/head
authorJohn Mulligan <jmulligan@redhat.com>
Tue, 21 Jan 2025 21:28:42 +0000 (16:28 -0500)
committerJohn Mulligan <jmulligan@redhat.com>
Fri, 24 Jan 2025 19:34:23 +0000 (14:34 -0500)
Add a label used by cephadm internally that was always set by
ceph-container [1] back to the new containerfile. This should
prevent issues with cephadm shell command thinking official ceph images
are not official ceph images.

[1] https://github.com/ceph/ceph-container/blob/30dc8b9a55f70a40983fd2da6ac31e1b9e977143/src/__DOCKERFILE_TRACEABILITY_LABELS__#L5

Signed-off-by: John Mulligan <jmulligan@redhat.com>
container/Containerfile

index 88f0d4ceaf8750afea1ccb74b5667204b37e4fe5..665e7991e8bf2511cd32da030dea1c13b4b7070d 100644 (file)
@@ -36,6 +36,7 @@ LABEL org.opencontainers.image.authors="Ceph Release Team <ceph-maintainers@ceph
       org.opencontainers.image.documentation="https://docs.ceph.com/"
 
 LABEL \
+ceph=True \
 FROM_IMAGE=${FROM_IMAGE} \
 CEPH_REF=${CEPH_REF} \
 CEPH_SHA1=${CEPH_SHA1} \