-
Notifications
You must be signed in to change notification settings - Fork 352
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.
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
packaging: add opencontainers image labels #3251
Merged
MustafaSaber
merged 1 commit into
master
from
packaging/add-org.opencontainers.image-labels
Sep 27, 2024
Merged
packaging: add opencontainers image labels #3251
MustafaSaber
merged 1 commit into
master
from
packaging/add-org.opencontainers.image-labels
Sep 27, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add [opencontainer image labels](https://github.com/opencontainers/image-spec/blob/main/annotations.md) (except org.opencontainers.image.created) to multiarch image. Decided not touch Dockerfile.arm* because it is better to unify them with Dockerfile (see e.g. #2566). Github action already adds opencontainer image labels: ```console docker inspect ghcr.io/zalando/skipper:v0.21.209 | jq .[0].Config.Labels { "maintainer": "Team Gateway&Proxy @ Zalando SE <[email protected]>", "org.opencontainers.image.created": "2024-09-26T09:40:09.452Z", "org.opencontainers.image.description": "An HTTP router and reverse proxy for service composition, including use cases like Kubernetes Ingress", "org.opencontainers.image.licenses": "NOASSERTION", "org.opencontainers.image.revision": "08a295f2cbf443d5d87f680d6ba3335fba57daef", "org.opencontainers.image.source": "https://github.com/zalando/skipper", "org.opencontainers.image.title": "skipper", "org.opencontainers.image.url": "https://github.com/zalando/skipper", "org.opencontainers.image.version": "v0.21.209" } ``` This change also fixes licenses and adds vendor label. Signed-off-by: Alexander Yastrebov <[email protected]>
👍 |
1 similar comment
👍 |
MustafaSaber
deleted the
packaging/add-org.opencontainers.image-labels
branch
September 27, 2024 19:29
@@ -68,6 +68,9 @@ jobs: | |||
tags: | | |||
type=semver,pattern=v{{version}} | |||
type=semver,pattern=v{{major}}.{{minor}} | |||
labels: | | |||
org.opencontainers.image.licenses=Apache-2.0 | |||
org.opencontainers.image.vendor="Zalando SE" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ended up with redundant quotes:
$ docker inspect ghcr.io/zalando/skipper:v0.21.210 | jq .[0].Config.Labels
{
"maintainer": "Team Gateway&Proxy @ Zalando SE <[email protected]>",
"org.opencontainers.image.created": "2024-09-27T19:39:37.441Z",
"org.opencontainers.image.description": "An HTTP router and reverse proxy for service composition, including use cases like Kubernetes Ingress",
"org.opencontainers.image.licenses": "Apache-2.0",
"org.opencontainers.image.revision": "05362a0b8d474441e65fb2fb425e170ca274be59",
"org.opencontainers.image.source": "https://github.com/zalando/skipper",
"org.opencontainers.image.title": "skipper",
"org.opencontainers.image.url": "https://github.com/zalando/skipper",
"org.opencontainers.image.vendor": "\"Zalando SE\"",
"org.opencontainers.image.version": "v0.21.210"
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #3256
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 30, 2024
Remove redundant quotes. Follow up on #3251 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
that referenced
this pull request
Sep 30, 2024
Remove redundant quotes. Follow up on #3251 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
to zalando-incubator/kubernetes-on-aws
that referenced
this pull request
Oct 1, 2024
* zalando/skipper#3256 * zalando/skipper#3254 * zalando/skipper#3255 * zalando/skipper#3253 * zalando/skipper#3252 * zalando/skipper#3251 * zalando/skipper#3250 zalando/skipper@v0.21.208...v0.21.211 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
to zalando-incubator/kubernetes-on-aws
that referenced
this pull request
Oct 1, 2024
* zalando/skipper#3250 * zalando/skipper#3251 * zalando/skipper#3252 * zalando/skipper#3253 * zalando/skipper#3255 * zalando/skipper#3254 * zalando/skipper#3256 zalando/skipper@v0.21.208...v0.21.211 Signed-off-by: Alexander Yastrebov <[email protected]>
AlexanderYastrebov
added a commit
to zalando-incubator/kubernetes-on-aws
that referenced
this pull request
Oct 1, 2024
* zalando/skipper#3250 * zalando/skipper#3251 * zalando/skipper#3252 * zalando/skipper#3253 * zalando/skipper#3255 * zalando/skipper#3254 * zalando/skipper#3256 zalando/skipper@v0.21.208...v0.21.211 Signed-off-by: Alexander Yastrebov <[email protected]>
RomanZavodskikh
pushed a commit
to zalando-incubator/kubernetes-on-aws
that referenced
this pull request
Oct 2, 2024
* zalando/skipper#3250 * zalando/skipper#3251 * zalando/skipper#3252 * zalando/skipper#3253 * zalando/skipper#3255 * zalando/skipper#3254 * zalando/skipper#3256 zalando/skipper@v0.21.208...v0.21.211 Step 1 #8264 Signed-off-by: Roman Zavodskikh <[email protected]>
Pushpalanka
pushed a commit
that referenced
this pull request
Oct 11, 2024
Add [opencontainer image labels](https://github.com/opencontainers/image-spec/blob/main/annotations.md) (except org.opencontainers.image.created) to multiarch image. Decided not touch Dockerfile.arm* because it is better to unify them with Dockerfile (see e.g. #2566). Github action already adds opencontainer image labels: ```console docker inspect ghcr.io/zalando/skipper:v0.21.209 | jq .[0].Config.Labels { "maintainer": "Team Gateway&Proxy @ Zalando SE <[email protected]>", "org.opencontainers.image.created": "2024-09-26T09:40:09.452Z", "org.opencontainers.image.description": "An HTTP router and reverse proxy for service composition, including use cases like Kubernetes Ingress", "org.opencontainers.image.licenses": "NOASSERTION", "org.opencontainers.image.revision": "08a295f2cbf443d5d87f680d6ba3335fba57daef", "org.opencontainers.image.source": "https://github.com/zalando/skipper", "org.opencontainers.image.title": "skipper", "org.opencontainers.image.url": "https://github.com/zalando/skipper", "org.opencontainers.image.version": "v0.21.209" } ``` This change also fixes licenses and adds vendor label. Signed-off-by: Alexander Yastrebov <[email protected]>
Pushpalanka
pushed a commit
that referenced
this pull request
Oct 11, 2024
Remove redundant quotes. Follow up on #3251 Signed-off-by: Alexander Yastrebov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add opencontainer image labels (except org.opencontainers.image.created) to multiarch image.
Decided not touch Dockerfile.arm* because it is better to unify them with Dockerfile (see e.g. #2566).
Github action already adds opencontainer image labels:
This change also fixes licenses and adds vendor label.