From 9dc8e5eb3ccc448b7dcb3864663d1ff21c8d6985 Mon Sep 17 00:00:00 2001 From: "Jonathan Gonzalez V." Date: Thu, 19 Dec 2024 17:35:11 +0100 Subject: [PATCH] chore: add missing labels in container images (#6377) The operator was missing a label "maintainer" for certifications and also for standards, it was relying on having the label from the parent image. Signed-off-by: Jonathan Gonzalez V. (cherry picked from commit b897b44fc3e6f9afe0b19654724cd9d9d4888fcc) --- Dockerfile | 6 ++++-- Dockerfile-ubi8 | 6 ++++-- Dockerfile-ubi9 | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 16b58275f2..f9ca156501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,14 +12,16 @@ ARG VERSION="dev" ARG TARGETARCH ENV SUMMARY="CloudNativePG Operator Container Image." \ - DESCRIPTION="This Docker image contains CloudNativePG Operator." + DESCRIPTION="This Docker image contains CloudNativePG Operator." \ + MAINTAINER="CloudNativePG Contributors." LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ io.k8s.display-name="$SUMMARY" \ io.k8s.description="$DESCRIPTION" \ name="CloudNativePG Operator" \ - vendor="CloudNativePG Contributors" \ + vendor="$MAINTAINER" \ + maintainer="$MAINTAINER" \ url="https://cloudnative-pg.io/" \ version="$VERSION" \ release="1" diff --git a/Dockerfile-ubi8 b/Dockerfile-ubi8 index 4c2712de72..1aea9e40ac 100644 --- a/Dockerfile-ubi8 +++ b/Dockerfile-ubi8 @@ -3,14 +3,16 @@ ARG VERSION="dev" ARG TARGETARCH ENV SUMMARY="CloudNativePG Operator Container Image." \ - DESCRIPTION="This Docker image contains CloudNativePG Operator." + DESCRIPTION="This Docker image contains CloudNativePG Operator." \ + MAINTAINER="CloudNativePG Contributors." LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ io.k8s.display-name="$SUMMARY" \ io.k8s.description="$DESCRIPTION" \ name="CloudNativePG Operator" \ - vendor="CloudNativePG Contributors" \ + vendor="$MAINTAINER" \ + maintainer="$MAINTAINER" \ url="https://cloudnative-pg.io/" \ version="$VERSION" \ release="1" diff --git a/Dockerfile-ubi9 b/Dockerfile-ubi9 index 74409e03ca..0d846d91b0 100644 --- a/Dockerfile-ubi9 +++ b/Dockerfile-ubi9 @@ -3,14 +3,16 @@ ARG VERSION="dev" ARG TARGETARCH ENV SUMMARY="CloudNativePG Operator Container Image." \ - DESCRIPTION="This Docker image contains CloudNativePG Operator." + DESCRIPTION="This Docker image contains CloudNativePG Operator." \ + MAINTAINER="CloudNativePG Contributors." LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ io.k8s.display-name="$SUMMARY" \ io.k8s.description="$DESCRIPTION" \ name="CloudNativePG Operator" \ - vendor="CloudNativePG Contributors" \ + vendor="$MAINTAINER" \ + maintainer="$MAINTAINER" \ url="https://cloudnative-pg.io/" \ version="$VERSION" \ release="1"