Skip to content

Update c/image to main#2333

Merged
openshift-merge-bot[bot] merged 2 commits into
containers:mainfrom
mtrmac:c-image-for-docker
Mar 6, 2025
Merged

Update c/image to main#2333
openshift-merge-bot[bot] merged 2 commits into
containers:mainfrom
mtrmac:c-image-for-docker

Conversation

@mtrmac

@mtrmac mtrmac commented Feb 27, 2025

Copy link
Copy Markdown
Contributor

... primarily to update docker/docker to v28; that broke API, so we need to update the c/image caller as well.

This is a superset of #2328 ; only updating docker/docker does not work.

// 0-2,3,1
//
// Deprecated: ParseUintList was only used internally and will be removed in the next release.
func ParseUintList(val string) (map[int]bool, error) {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This is called from pkg/sysinfo/sysinfo.go , so further updates might be needed.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

… and they are.

Podman also calls this function; I guess c/common will need to carry it?

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.

I think so, maybe copy it to pkg/parse here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done, PTAL.

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.

Note I wrote pkg/parse intentionally, not pkg/parsers.
While moving 1 to 1 like this makes sense I find it quite hard for callers to justify why there is a parse and parsers package here. (Not that most of the package structure makes sense here but we should not make it worse)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Note I wrote pkg/parse intentionally, not pkg/parsers.

I’m sorry, I missed that.


I also missed something I should have checked sooner: we are already carrying a copy in c/storage; so, I have modified this PR to use that one, and now c/common has no direct dependency on Docker. I don’t think that helps all that much, Podman will still need to adjust for deprecations.

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.

Ack, yeah makes sense top use c/storage if we already carry the copy anyway there

@mheon

mheon commented Mar 5, 2025

Copy link
Copy Markdown
Member

LGTM on my end. I'm fine with the current parsers name (it's what we've done when we ran into this previously) but would also be fine with a rename.

mtrmac added 2 commits March 5, 2025 21:52
…List

It is deprecated in the docker repo as of v28. We are already carrying a
variant in c/storage.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
... primarily to update docker/docker to v28; that broke API, so we
need to update the c/image caller as well.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac mtrmac force-pushed the c-image-for-docker branch from 56018d9 to c8a5c6e Compare March 5, 2025 20:56

@Luap99 Luap99 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

@openshift-ci

openshift-ci Bot commented Mar 6, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, mtrmac

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

The pull request process is described here

Details 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-merge-bot openshift-merge-bot Bot merged commit 6e82793 into containers:main Mar 6, 2025
@mtrmac mtrmac deleted the c-image-for-docker branch March 6, 2025 14:58
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.

3 participants