Skip to content

system: use containers/storage for LCOW validation#246

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
flouthoc:split-lcow
Feb 7, 2023
Merged

system: use containers/storage for LCOW validation#246
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
flouthoc:split-lcow

Conversation

@flouthoc
Copy link
Copy Markdown
Contributor

@flouthoc flouthoc commented Feb 7, 2023

Newer versions of github.com/docker/docker does not supports the LCOW validation functions which imagebuilder uses hence move them to a local package of imagebuilder and drop dependency on
github.com/docker/docker/pkg/system

Alternative solution: refactor imagebuilder to stop using LCOWSupported()

Closes and helps in: containers/buildah#4555

@flouthoc flouthoc mentioned this pull request Feb 7, 2023
Closed
@flouthoc
Copy link
Copy Markdown
Contributor Author

flouthoc commented Feb 7, 2023

@nalind @rhatdan I think moby has dropped LCOW check and does not contain any public API for it, hence we can move it to imagebuilder or refactor imagebuilder so we can also drop LCOW support but I am not sure if anybody is still using logic for the former one hence a safer bet is to move LCOW checks here.

@nalind
Copy link
Copy Markdown
Member

nalind commented Feb 7, 2023

That logic is still around in the containers/storage pkg/system. Switch it to using that, it's less code to carry around in here.

@flouthoc flouthoc mentioned this pull request Feb 7, 2023
Merged
@flouthoc
Copy link
Copy Markdown
Contributor Author

flouthoc commented Feb 7, 2023

I see some overlapping work here: #245 @nalind let me know if i can close this.

@flouthoc flouthoc changed the title system: add local LCOW validation functions system: use containers/storage for LCOW validation Feb 7, 2023
@flouthoc
system: use containers/storage for LCOW validation
d527238 
Newer versions of `github.com/docker/docker` does not supports the LCOW
validation functions which imagebuilder uses hence use
`github.com/containers/storage/pkg/system`.

Alternative solution: refactor imagebuilder to stop using
LCOWSupported()

Signed-off-by: Aditya R <arajan@redhat.com>
@nalind
Copy link
Copy Markdown
Member

nalind commented Feb 7, 2023

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Feb 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, nalind

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Feb 7, 2023

@flouthoc: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@nalind
Copy link
Copy Markdown
Member

nalind commented Feb 7, 2023

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 7, 2023
@nalind
Copy link
Copy Markdown
Member

nalind commented Feb 7, 2023

/override "Travis CI - Pull Request"

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Feb 7, 2023

@nalind: Overrode contexts on behalf of nalind: Travis CI - Pull Request

Details

In response to this:

/override "Travis CI - Pull Request"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-merge-robot openshift-merge-robot merged commit 6e08c89 into openshift:master Feb 7, 2023
@nalind nalind mentioned this pull request Feb 8, 2023
Closed
@mtrmac mtrmac mentioned this pull request Feb 8, 2023
Merged
mtrmac added a commit to mtrmac/libpod that referenced this pull request Feb 8, 2023
@mtrmac
Vendor c/image after containers/image#1816
e308ba0 
Also includes unreleased openshift/imagebuilder#246 to work
with the updated docker/docker dependency.

And updates some references to newly deprecated docker/docker symbols.

[NO NEW TESTS NEEDED]

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp Awaiting requested review from mrunalp

@TomSweeneyRedHat TomSweeneyRedHat Awaiting requested review from TomSweeneyRedHat

Assignees

@nalind nalind

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@flouthoc @nalind @openshift-merge-robot