Skip to content

vendor: github.com/opencontainers/image-spec v1.1.0-rc3#45437

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:vendor_image_spec
May 31, 2023
Merged

vendor: github.com/opencontainers/image-spec v1.1.0-rc3#45437
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:vendor_image_spec

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Apr 28, 2023 •
edited
Loading

Temporarily using using the last commit before the tag, and a replace rule. Because SemVer considers v1.1.0-rc.3 older than v1.1.0-rc2 (due to te missing .). The "rc.3" is the correct format, but older releases did not use this format, so now sort higher, see:

https://semvercompare.azurewebsites.net/?version=1.1.0-rc1&version=1.1.0-rc2&version=1.1.0-rc.3

We cannot use the commit of the tag itself (085b884d628c42985cc2f2a99e5701f7e9b3bd1f), because go mod is being smart, and that commit is resolved to the tag (v1.1.0-rc.3), then compared with v1.1.0-rc2.0.20221005185240-3a7f492d3f1b, which is considered newer than v1.1.0-rc.3, and so it "upgrades" by "downgrading".

full diff: opencontainers/image-spec@3a7f492...v1.1.0-rc.3

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah
thaJeztah commented Apr 28, 2023
View reviewed changes
vendor.mod Outdated
github.com/morikuni/aec v1.0.0
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // replaced; see replace rule for the correct version (v1.1.0-rc.3)
Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Apr 28, 2023

Choose a reason for hiding this comment

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

Actually; let me replace this for the last commit before the tag, so that others would have almost the same minimum version at least.

Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Apr 28, 2023

Choose a reason for hiding this comment

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

We cannot use the commit of the tag itself, because go mod is being smart, and opencontainers/image-spec@085b884 is converted to v1.1.0-rc.3 (because it's the same commit as the tag), then v1.1.0-rc.3 is compared with v1.1.0-rc2.0.20221005185240-3a7f492d3f1b, which is considered newer, so it then upgrades by "rolling back" 😭 😂

@thaJeztah thaJeztah force-pushed the vendor_image_spec branch 3 times, most recently from 9755d4c to 2736042 Compare April 29, 2023 00:06
@thaJeztah thaJeztah changed the title vendor: github.com/opencontainers/image-spec v1.1.0-rc(.)3 vendor: github.com/opencontainers/image-spec v1.1.0-rc3 Apr 29, 2023
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 29, 2023

Looks like BuildKit needs an update;

#23 64.97 vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/image.go:25:4: unknown field Architecture in struct literal of type v1.Image
#23 64.97 vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/image.go:26:4: unknown field OS in struct literal of type v1.Image
#23 64.97 vendor/github.com/moby/buildkit/frontend/dockerfile/dockerfile2llb/image.go:27:4: unknown field Variant in struct literal of type v1.Image

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 29, 2023

ARGH.. and I had my PR to prepare for that; and it wasn't merged;

@thaJeztah thaJeztah mentioned this pull request Apr 29, 2023
Merged
@thaJeztah thaJeztah marked this pull request as draft April 29, 2023 01:12
@thaJeztah thaJeztah mentioned this pull request Apr 29, 2023
Merged
@thaJeztah thaJeztah force-pushed the vendor_image_spec branch 2 times, most recently from 7342371 to c7036d8 Compare April 30, 2023 18:07
@thaJeztah thaJeztah mentioned this pull request May 2, 2023
Merged
@thaJeztah thaJeztah force-pushed the vendor_image_spec branch from c7036d8 to dd8653e Compare May 4, 2023 11:44
@thaJeztah thaJeztah force-pushed the vendor_image_spec branch 2 times, most recently from 73ad490 to be74ef4 Compare May 19, 2023 11:48
@thaJeztah thaJeztah mentioned this pull request May 22, 2023
Merged
@thaJeztah thaJeztah force-pushed the vendor_image_spec branch from be74ef4 to b42e367 Compare May 26, 2023 00:36
@thaJeztah thaJeztah marked this pull request as ready for review May 26, 2023 00:36
@thaJeztah thaJeztah merged commit 8d67d0c into moby:master May 31, 2023
@thaJeztah thaJeztah deleted the vendor_image_spec branch May 31, 2023 09:12
@thaJeztah thaJeztah mentioned this pull request May 31, 2023
Merged
@thaJeztah thaJeztah added this to the 25.0.0 milestone Jun 26, 2023
@neersighted neersighted mentioned this pull request Jun 29, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rumpl rumpl rumpl approved these changes

@vvoland vvoland vvoland approved these changes

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

25.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @rumpl @vvoland