From 3a5f30a6958c9f4676af69800810ca2a8442e01e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 17 Sep 2025 15:22:40 -0400 Subject: [PATCH] chore(KONFLUX-6210): fix and set name and cpe label for network-observability-console-plugin-zstream For https://issues.redhat.com/browse/KONFLUX-6210, clair needs access to a name and cpe label that it can use to look up the image in VEX statements. See also release-engineering/rhtap-ec-policy#149 Signed-off-by: Ralph Bean Assisted-by: Gemini Use parameterized buildversion_y for cpe --- Dockerfile-args.downstream | 1 + Dockerfile.downstream | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile-args.downstream b/Dockerfile-args.downstream index 891f617bd..0fbd6a4db 100644 --- a/Dockerfile-args.downstream +++ b/Dockerfile-args.downstream @@ -1 +1,2 @@ BUILDVERSION=1.9.3 +BUILDVERSION_Y=1.9 diff --git a/Dockerfile.downstream b/Dockerfile.downstream index 7c0972f78..924359629 100644 --- a/Dockerfile.downstream +++ b/Dockerfile.downstream @@ -1,4 +1,5 @@ ARG BUILDVERSION +ARG BUILDVERSION_Y FROM registry.access.redhat.com/ubi9/nodejs-22:9.6-1756959443 as web-builder @@ -35,6 +36,7 @@ RUN go build -tags strictfipsruntime -ldflags "-X 'main.buildVersion=$BUILDVERSI FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6-1755695350 ARG BUILDVERSION +ARG BUILDVERSION_Y COPY --from=web-builder /opt/app-root/web/dist ./web/dist COPY --from=go-builder /opt/app-root/plugin-backend ./ @@ -45,7 +47,8 @@ USER 65532:65532 ENTRYPOINT ["./plugin-backend"] LABEL com.redhat.component="network-observability-console-plugin-container" -LABEL name="network-observability-console-plugin" +LABEL name="network-observability/network-observability-console-plugin-rhel9" +LABEL cpe="cpe:/a:redhat:network_observ_optr:$BUILDVERSION_Y::el9" LABEL io.k8s.display-name="Network Observability Console Plugin" LABEL io.k8s.description="Network Observability Console Plugin" LABEL summary="Network Observability Console Plugin"