Skip to content

vendor: bump containers/(storage, buildah, image, common)#18130

Merged
rhatdan merged 4 commits intocontainers:mainfrom
flouthoc:bump-deps
Apr 10, 2023
Merged

vendor: bump containers/(storage, buildah, image, common)#18130
rhatdan merged 4 commits intocontainers:mainfrom
flouthoc:bump-deps

Conversation

@flouthoc
Copy link
Copy Markdown
Collaborator

@flouthoc flouthoc commented Apr 10, 2023

Does this PR introduce a user-facing change?

vendor: bump `containers/(storage, buildah, image, common)`

Replacement of: #18106

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 10, 2023
@flouthoc flouthoc mentioned this pull request Apr 10, 2023
Closed
flouthoc added 3 commits April 10, 2023 17:30
@flouthoc
vendor: bump containers/(storage, common, buildah, image)
260bc3e 
Bump containers/(storage, common, buildah and image)

Changes since 2023-01-01:
 - skip mount-cache-selinux-long-name test under remote, with
   a FIXME requesting that someone see if it can be made to work.

 - skip six tests that fail under rootless-remote

 - add new --build-arg-file option:
 - update man page

Squash of:
* containers@cf56eb1
* containers@561f082

Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
test/system: expect 12 char for short id
b624ad7 
After containers/buildah#4660 buildah
spits a 12 letter image short id instead of 13 so lets honor that.

Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
test: retrofit error message
7edf73d 
Retrofit error message as per containers@cf56eb1

Signed-off-by: Aditya R <arajan@redhat.com>
edsantiago
edsantiago reviewed Apr 10, 2023
View reviewed changes
test/buildah-bud/apply-podman-deltas
Comment on lines -255 to -256
skip "Test is completely broken, see buildah issue 4396" \
"bud-multiple-platform-values"
Copy link
Copy Markdown
Member

@edsantiago edsantiago Apr 10, 2023

Choose a reason for hiding this comment

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

I see no indication that containers/buildah#4396 has been fixed or even looked at?

Copy link
Copy Markdown
Member

@edsantiago edsantiago Apr 10, 2023

Choose a reason for hiding this comment

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

NEVER MIND! I See it's skipped in buildah itself now.

@flouthoc flouthoc added the bloat_approved Approve a PR in which binary file size grows by over 50k label Apr 10, 2023
@nalind nalind mentioned this pull request Apr 10, 2023
Closed
@flouthoc
build: pass env by reference
944accf 
Buildah uses a different logic to pass environment variable to executor
now after: https://github.com/containers/buildah/pull/4702/files so
podman should same logic and pass env by reference.

Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
Copy link
Copy Markdown
Collaborator Author

flouthoc commented Apr 10, 2023

It seems containers/buildah#4702 also affected podman-remote pushed a new commit.

@ashley-cui ashley-cui mentioned this pull request Apr 10, 2023
Merged
@edsantiago
Copy link
Copy Markdown
Member

edsantiago commented Apr 10, 2023

LGTM. In future I hope we can continue using hack/buildah-vendor-treadmill --pick, with one vendor commit and one cleanup commit for ease of future maintenance, but it sounds like we're in a hurry today.

@containers/podman-maintainers PTAL. Please note that podman binary is now at 57M.

podman           size= 57,981,328  delta=523,400
***************************************************************************
* bin/podman grew by 523,400 bytes; max allowed is 51,200.
*
* Continuing due to 'bloat_approved' label
*
***************************************************************************
bin/podman-remote    size= 42,444,072  delta=513,424
***************************************************************************
* bin/podman-remote grew by 513,424 bytes; max allowed is 51,200.
*
* Continuing due to 'bloat_approved' label
*
***************************************************************************
bin/quadlet          size=  2,701,571  delta=     8

@flouthoc
Copy link
Copy Markdown
Collaborator Author

flouthoc commented Apr 10, 2023

@containers/podman-maintainers PTAL

@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 10, 2023

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 10, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@rhatdan rhatdan merged commit 1f2775c into containers:main Apr 10, 2023
@flouthoc flouthoc mentioned this pull request May 2, 2023
Merged
@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 2, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 2, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@edsantiago edsantiago edsantiago left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@rhatdan rhatdan

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@flouthoc @edsantiago @rhatdan