Add OCI annotations and adjust existing annotations #45167
Merged
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
The org.label-schema labels on Docker images have been superseded by pre-defined OCI annotations. However, there is still a lot of tooling in use that relies on the org.label-schema, so we do not want to drop them. This commit adds values for the org.opencontainers.image pre-defined annotation keys. Additionally, we correct an issue with the label used to represent the license, to use the org.label-schema.license label. While this label was never accepted into the org.label-schema specfication (because this specification was superseded, it's not that it was explicitly rejected) there are containers out there using this label. In particular, our base image is and so we need to override otherwise we inherit, and end up mis-reporting the license.
jasontedor
added
>enhancement
:Core/Infra/Core
|
Pinging @elastic/es-core-infra |
|
@elasticmachine update branch |
mark-vieira
approved these changes
Aug 4, 2019
|
I pushed quotes in 2d3eedf. |
jasontedor
added a commit
that referenced
this pull request
Aug 4, 2019
The org.label-schema labels on Docker images have been superseded by pre-defined OCI annotations. However, there is still a lot of tooling in use that relies on the org.label-schema, so we do not want to drop them. This commit adds values for the org.opencontainers.image pre-defined annotation keys. Additionally, we correct an issue with the label used to represent the license, to use the org.label-schema.license label. While this label was never accepted into the org.label-schema specfication (because this specification was superseded, it's not that it was explicitly rejected) there are containers out there using this label. In particular, our base image is and so we need to override otherwise we inherit, and end up mis-reporting the license.
jasontedor
added a commit
that referenced
this pull request
Aug 4, 2019
The org.label-schema labels on Docker images have been superseded by pre-defined OCI annotations. However, there is still a lot of tooling in use that relies on the org.label-schema, so we do not want to drop them. This commit adds values for the org.opencontainers.image pre-defined annotation keys. Additionally, we correct an issue with the label used to represent the license, to use the org.label-schema.license label. While this label was never accepted into the org.label-schema specfication (because this specification was superseded, it's not that it was explicitly rejected) there are containers out there using this label. In particular, our base image is and so we need to override otherwise we inherit, and end up mis-reporting the license.
jasontedor
added a commit
that referenced
this pull request
Aug 4, 2019
The org.label-schema labels on Docker images have been superseded by pre-defined OCI annotations. However, there is still a lot of tooling in use that relies on the org.label-schema, so we do not want to drop them. This commit adds values for the org.opencontainers.image pre-defined annotation keys. Additionally, we correct an issue with the label used to represent the license, to use the org.label-schema.license label. While this label was never accepted into the org.label-schema specfication (because this specification was superseded, it's not that it was explicitly rejected) there are containers out there using this label. In particular, our base image is and so we need to override otherwise we inherit, and end up mis-reporting the license.
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.
The org.label-schema labels on Docker images have been superseded by pre-defined OCI annotations. However, there is still a lot of tooling in use that relies on the org.label-schema, so we do not want to drop them. This commit adds values for the org.opencontainers.image pre-defined annotation keys. Additionally, we correct an issue with the label used to represent the license, to use the org.label-schema.license label. While this label was never accepted into the org.label-schema specfication (because this specification was superseded, it's not that it was explicitly rejected) there are containers out there using this label. In particular, our base image is and so we need to override otherwise we inherit, and end up mis-reporting the license.
Relates #45162
Relates #45166