Skip to content

chore(KONFLUX-6210): fix name label and set cpe label #2148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ralphbean wants to merge 1 commit into from
Closed

chore(KONFLUX-6210): fix name label and set cpe label #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions image/db/rhel/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ LABEL \
url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \
# We must set version label to prevent inheriting value set in the base stage.
version="${SCANNER_TAG}" \
cpe="cpe:/a:redhat:advanced_cluster_security:4.8::el8" \
# Release label is required by EC although has no practical semantics.
# We also set it to not inherit one from a base stage in case it's RHEL or UBI.
release="1"
Expand Down Expand Up @@ -57,7 +58,7 @@ FROM scanner-db-common AS scanner-db-slim
LABEL \
com.redhat.component="rhacs-scanner-db-slim-container" \
io.k8s.display-name="scanner-db-slim" \
name="rhacs-scanner-db-slim-rhel8"
name="advanced-cluster-security/rhacs-scanner-db-slim-rhel8"

ENV ROX_SLIM_MODE="true"

Expand All @@ -67,7 +68,7 @@ FROM scanner-db-common AS scanner-db
LABEL \
com.redhat.component="rhacs-scanner-db-container" \
io.k8s.display-name="scanner-db" \
name="rhacs-scanner-db-rhel8"
name="advanced-cluster-security/rhacs-scanner-db-rhel8"

COPY --chown=0:0 .konflux/scanner-data/blob-pg-definitions.sql.gz \
/docker-entrypoint-initdb.d/definitions.sql.gz
5 changes: 3 additions & 2 deletions image/scanner/rhel/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ LABEL \
url="https://catalog.redhat.com/software/container-stacks/detail/60eefc88ee05ae7c5b8f041c" \
# We must set version label to prevent inheriting value set in the base stage.
version="${SCANNER_TAG}" \
cpe="cpe:/a:redhat:advanced_cluster_security:4.8::el8" \
# Release label is required by EC although has no practical semantics.
# We also set it to not inherit one from a base stage in case it's RHEL or UBI.
release="1"
Expand Down Expand Up @@ -85,7 +86,7 @@ FROM scanner-common AS scanner-slim
LABEL \
com.redhat.component="rhacs-scanner-slim-container" \
io.k8s.display-name="scanner-slim" \
name="rhacs-scanner-slim-rhel8"
name="advanced-cluster-security/rhacs-scanner-slim-rhel8"

ENV ROX_SLIM_MODE="true"

Expand All @@ -96,7 +97,7 @@ FROM scanner-common AS scanner
LABEL \
com.redhat.component="rhacs-scanner-container" \
io.k8s.display-name="scanner" \
name="rhacs-scanner-rhel8"
name="advanced-cluster-security/rhacs-scanner-rhel8"

ENV NVD_DEFINITIONS_DIR="/nvd_definitions"
ENV K8S_DEFINITIONS_DIR="/k8s_definitions"
Expand Down