]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
container: add label ceph=True back 61612/head
authorJohn Mulligan <jmulligan@redhat.com>
Tue, 21 Jan 2025 21:28:42 +0000 (16:28 -0500)
committerAdam King <adking@redhat.com>
Fri, 31 Jan 2025 21:29:04 +0000 (16:29 -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>
(cherry picked from commit b4f4323e6ccacbff8899ef9b5c336b238101fe0e)

container/Containerfile

index c954ebed1be81841ba8bfaa3460f59f0e37aed69..979d7502e989b8dbb5b8e3217a73ddf21c0f2033 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} \