Skip to content

Merge v1.56.1 into main #2214

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 4 commits into from
Jan 15, 2025
Merged

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Jan 15, 2025

This allows referring to commits on main from c/image, without Go trying to “upgrade” from a pre-v1.57 to v1.56.1. The parent relationship created by the merge tells Go that the main commit is newer than v1.56.1.

(Yes, this changes no lines of code. The created “parent” link is what matters.)

Luap99 and others added 4 commits December 9, 2024 15:06
In go one should never modify a slice while also iterating over it at
the same time. This causes weird side effects as the underlying array
elements are shifted around without the range loop index knowing.
So if you delete a element the loop will then actually skip the next one
and theoretically access out of bounds on the last element which does
not panic but rather return the default zero type, nil here which then
causes the panic on layer.Flags == nil.

Here is a simple example to show the behavior:
func main() {
	slice := []int{1, 2, 3, 4, 5, 6, 7, 8, 9}
	for _, num := range slice {
		if num == 5 {
			slice = slices.DeleteFunc(slice, func(n int) bool {
				return n == 5
			})
		}
		fmt.Println(num)
	}
}

The loop will not print 6, but then as last number it prints 0 (the
default zero type for an int).

Fixes containers#2184

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 99b0d2d)
[release-1.56] store: correctly remove incomplete layers on load.
In preparation for Podman v5.3.2, bump c/storage to v1.56.1.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
@mtrmac
Copy link
Collaborator Author

mtrmac commented Jan 15, 2025

@TomSweeneyRedHat @giuseppe PTAL; this is blocking containers/image#2613 .

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan
Copy link
Member

rhatdan commented Jan 15, 2025

/approve
/lgtm

Copy link
Contributor

openshift-ci bot commented Jan 15, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: giuseppe, mtrmac, 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-bot openshift-merge-bot bot merged commit aef3f60 into containers:main Jan 15, 2025
20 checks passed
@mtrmac mtrmac deleted the into-main branch January 15, 2025 21:27
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.

5 participants