Skip to content

Added support for setting OS version in docker manifest annotate.#2578

Merged
thaJeztah merged 1 commit into
docker:masterfrom
cpuguy83:anotate_os_version
Jun 15, 2020
Merged

Added support for setting OS version in docker manifest annotate.#2578
thaJeztah merged 1 commit into
docker:masterfrom
cpuguy83:anotate_os_version

Conversation

@cpuguy83

@cpuguy83 cpuguy83 commented Jun 12, 2020

Copy link
Copy Markdown
Collaborator

Carry of #1461, just rebased.

fixes #2722

Signed-off-by: Saswat Bhattacharya <sas.saswat@gmail.com>
@cpuguy83 cpuguy83 requested a review from thaJeztah as a code owner June 12, 2020 19:08
@cpuguy83 cpuguy83 requested a review from tonistiigi June 12, 2020 19:08
@tonistiigi

Copy link
Copy Markdown
Member

@cpuguy83 fyi, this use-case is also covered with buildx imagetools create

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

Merging #2578 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##           master    #2578   +/-   ##
=======================================
  Coverage   58.04%   58.04%           
=======================================
  Files         295      295           
  Lines       21166    21169    +3     
=======================================
+ Hits        12285    12288    +3     
  Misses       7979     7979           
  Partials      902      902           

@sozercan

Copy link
Copy Markdown

@tonistiigi Is there an example of setting os.version using buildx imagetools create? I couldn't find it in https://github.com/docker/buildx#buildx-imagetools-create-options-source-source

@tonistiigi

Copy link
Copy Markdown
Member

@sozercan -f can point to a file containing the JSON descriptor with all the platform fields and annotations you would want that item to have in the final manifest list. But yes, I agree it could use more docs (and I'm not sure how well tested it is).

Not against this PR as well as clearly seems something that was forgotten, but generally recommend buildx instead of manifest command.

@thaJeztah thaJeztah left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah

Copy link
Copy Markdown
Member

@tonistiigi ok to go?

@silvin-lubecki silvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sjackman

Copy link
Copy Markdown

-f can point to a file containing the JSON descriptor with all the platform fields and annotations you would want that item to have in the final manifest list. But yes, I agree it could use more docs (and I'm not sure how well tested it is).

@tonistiigi Could you please give an example of this JSON file?

@sjackman

Copy link
Copy Markdown

@tonistiigi wrote…

fyi, this use-case is also covered with buildx imagetools create

How can docker buildx imagetools create set os.version?

@sjackman

Copy link
Copy Markdown

I successfully uploaded an image index that includes os.version using Skopeo! https://github.com/containers/skopeo

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

docker manifest annotate should be able to add os.version to an image(Windows version support)

8 participants