From 45234b76fc2302e1f5f3596caa2cac9815b0653b Mon Sep 17 00:00:00 2001 From: Adam Cmiel Date: Wed, 17 Jan 2024 17:01:20 +0100 Subject: [PATCH 1/2] Add labels required by the Red Hat EC policy See required_labels in https://github.com/release-engineering/rhtap-ec-policy/blob/main/data/rule_data.yml Signed-off-by: Adam Cmiel --- Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Dockerfile b/Dockerfile index 6b0393d8..a8238963 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,4 +22,17 @@ LABEL org.opencontainers.image.description="CLI tool and library for generating LABEL org.opencontainers.image.vendor="Red Hat, Inc." LABEL org.opencontainers.image.licenses="Apache-2.0" +# required per https://github.com/release-engineering/rhtap-ec-policy/blob/main/data/rule_data.yml +# TODO: set up in Bugzilla +LABEL com.redhat.component="syft" +LABEL version="0.89.0" +# TODO: document the need to bump this on every re-release of the same version +LABEL release="1" +LABEL name="syft" +LABEL description="CLI tool and library for generating a Software Bill of Materials from container images and filesystems" +LABEL io.k8s.description="CLI tool and library for generating a Software Bill of Materials from container images and filesystems" +LABEL vendor="Red Hat, Inc." +LABEL url="https://github.com/redhat-appstudio/rh-syft" +LABEL distribution-scope="public" + ENTRYPOINT ["/syft"] From b18c6d2e45e6a5913fa5c6cb940a17dbc113dd10 Mon Sep 17 00:00:00 2001 From: Adam Cmiel Date: Thu, 18 Jan 2024 17:11:16 +0100 Subject: [PATCH 2/2] README: document the version label When updating to a new upstream release, you need to bump the version label correspondingly. Signed-off-by: Adam Cmiel --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3d992284..b361918c 100644 --- a/README.md +++ b/README.md @@ -42,9 +42,12 @@ Check if there is a new upstream version to update to: make check-release ``` -If the downstream is behind upstream, it's time to update. Start by bumping the -`CURRENT_RELEASE` in the Makefile and commiting the change (best done on a new branch -dedicated to the [midstream update](#updating-the-midstream). +If the downstream is behind upstream, it's time to update. First step: + +* Bump the `CURRENT_RELEASE` in the Makefile +* Bump the `version` label in the Dockerfile +* Commit the changes (best done on a new branch dedicated to the + [midstream update](#updating-the-midstream))