Skip to content

vendor: update docker, common, image, storage and buildah #26288

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

Merged
merged 6 commits into from
Jun 6, 2025

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Jun 5, 2025

Some breaking changes that we must handle manually.

Does this PR introduce a user-facing change?

None

Copy link
Contributor

openshift-ci bot commented Jun 5, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2025
@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Jun 5, 2025
@Luap99
Copy link
Member Author

Luap99 commented Jun 5, 2025

cc @mtrmac @nalind

@Luap99 Luap99 added the bloat_approved Approve a PR in which binary file size grows by over 50k label Jun 5, 2025
Luap99 and others added 4 commits June 5, 2025 12:19
Two incomptable changes, they removed the BridgeNfIP6tables
and BridgeNfIptables fields so we must drop them. As they are not
important ones that should not cause problems.

Second, they moved to using DockerOCIImageConfig from another new module.
The json format did not chnage so this is not an external API break.

Signed-off-by: Paul Holzinger <[email protected]>
Includes one breaking change for the flag as BuildOutputs now accept a
slice.

Signed-off-by: Paul Holzinger <[email protected]>
Newer versions expect to use a new test helper.

Signed-off-by: Nalin Dahyabhai <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>
Copy link

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

Luap99 added 2 commits June 5, 2025 13:39
The buildah test code chnages so I had to manually resolve the conflict.

Signed-off-by: Paul Holzinger <[email protected]>
The --output option is not supported with remote.

Signed-off-by: Paul Holzinger <[email protected]>
Entrypoint: info.Config.Entrypoint,
Labels: info.Labels,
StopSignal: info.Config.StopSignal,
},
Copy link
Member

@nalind nalind Jun 5, 2025

Choose a reason for hiding this comment

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

info can include healthcheck infornation information, and config can, too. Should it be added here?

Copy link
Member Author

Choose a reason for hiding this comment

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

well my goal is to update the vendor code, if there are new api fields to show/explore that is part of the work @inknos is doing right now I assume he would pick it up eventually when we get around to the right API versions.
For now I rather not alter the output just like that.

Copy link
Member

Choose a reason for hiding this comment

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

Fair enough.

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

LGTM, deferring to your expertise for the BridgeNfIP*tables fields.

@Luap99
Copy link
Member Author

Luap99 commented Jun 6, 2025

@mheon @baude PTAL

@mheon
Copy link
Member

mheon commented Jun 6, 2025

LGTM

@baude
Copy link
Member

baude commented Jun 6, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 246a688 into containers:main Jun 6, 2025
83 of 85 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bloat_approved Approve a PR in which binary file size grows by over 50k kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants