Skip to content
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

Update vendor of containers(image, common, buildah, storage) #15900

Merged
merged 2 commits into from
Sep 23, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Sep 22, 2022

Does this PR introduce a user-facing change?

Updated to latest containers(image, common, buildah, storage)

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 22, 2022
@rhatdan rhatdan force-pushed the VENDOR branch 4 times, most recently from fd24b89 to 66d460b Compare September 22, 2022 18:30
@mheon
Copy link
Member

mheon commented Sep 22, 2022

LGTM

@github-actions github-actions bot added the kind/api-change Change to remote API; merits scrutiny label Sep 22, 2022

if cmd.Flag("network").Changed {
if buildOpts.Network != "host" && buildOpts.Isolation == buildahDefine.IsolationChroot.String() {
return fmt.Errorf("cannot set --network %s --isolation %s", buildOpts.Network, buildOpts.Isolation)
Copy link
Member

Choose a reason for hiding this comment

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

Inconsistent with buildah:

# #| expected: =~ 'cannot set --network other than host with --isolation chroot'
# #|   actual:    'Error: cannot set --network none --isolation chroot'

Copy link
Member

Choose a reason for hiding this comment

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

FYI options are change the message, skip the test (see treadmill PR), or use the errmsg directive in apply-whatever to change the expected error message. I think changing the podman error message is the easiest, but I don't have all the facts.

@rhatdan rhatdan force-pushed the VENDOR branch 3 times, most recently from 3c84ac8 to 1575f0e Compare September 23, 2022 15:31
rhatdan and others added 2 commits September 23, 2022 14:12
Changes since 2022-09-09:
 - man page: add --skip-unused-stages (buildah 4249)
 - man page: bring in new Note for --cache-ttl (4248)
 - system tests: de-stutter (4205)

 - (internal): in skip() applier: escape asterisk, otherwise
   the "bud with --dns* flags" sed expression never applies.

Signed-off-by: Ed Santiago <[email protected]>
Signed-off-by: Daniel J Walsh <[email protected]>
@cdoern
Copy link
Contributor

cdoern commented Sep 23, 2022

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 23, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cdoern, rhatdan

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-merge-robot openshift-merge-robot merged commit 40e8bcb into containers:main Sep 23, 2022
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 20, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants