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

[release-1.23 backport] bump to race-free c/image and c/storage #3903

Merged

Conversation

flouthoc
Copy link
Collaborator

@flouthoc flouthoc commented Apr 6, 2022

Commits explained in bullet points.

For reference actual upstream PR: containers/image#1480 and containers/storage#1153

Deps are tested here: containers/podman#13793

Needed for: BZ 2066364

Signed-off-by: Aditya R <arajan@redhat.com>
Use race-free `AddNames` instead of `SetNames` by bumping `c/image`

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

flouthoc commented Apr 6, 2022

@jnovy @TomSweeneyRedHat PTAL

@flouthoc
Copy link
Collaborator Author

flouthoc commented Apr 6, 2022

Smoke is failing cause chroot/root.go was not gofmt-ed here #3853 , I'm doing gofmt on chroot/root.go in a separate commit,I hope its ok.

@@ -894,7 +894,7 @@ func setCapabilities(spec *specs.Spec, keepCaps ...string) error {
capMap := map[capability.CapType][]string{
capability.BOUNDING: spec.Process.Capabilities.Bounding,
capability.EFFECTIVE: spec.Process.Capabilities.Effective,
capability.INHERITABLE: []string{},
capability.INHERITABLE: {},
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was added here #3853 , I am just running gofmt here so smoke test passes.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@nalind @giuseppe Could you please review change in this line.

Copy link
Member

Choose a reason for hiding this comment

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

An empty slice either way, so I don't see an issue with it.

Copy link
Member

Choose a reason for hiding this comment

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

Strange that gofmt changed it though.

This is causing smoke test to fail so replace run.go with a goformatted
version.

[NO NEW TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
@TomSweeneyRedHat TomSweeneyRedHat changed the title [relase-1.23 backport] bump to race-free c/image and c/storage [release-1.23 backport] bump to race-free c/image and c/storage Apr 6, 2022
@TomSweeneyRedHat
Copy link
Member

LGTM
and happy green test buttons.

@flouthoc
Copy link
Collaborator Author

flouthoc commented Apr 7, 2022

@containers/buildah-maintainers PTAL. Could we merge this and cut a new 1.23.x release then I can vendor this into podman.

@rhatdan
Copy link
Member

rhatdan commented Apr 7, 2022

/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 7, 2022

[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

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 label Apr 7, 2022
@openshift-merge-robot openshift-merge-robot merged commit 5a4c930 into containers:release-1.23 Apr 7, 2022
@flouthoc
Copy link
Collaborator Author

flouthoc commented Apr 7, 2022

We would need a release as well or i could vendor branch directly as well if that works.

@TomSweeneyRedHat
Copy link
Member

@flouthoc, I'll spin one up shortly. Just getting out of morning meetings now.

@rhatdan
Copy link
Member

rhatdan commented Apr 7, 2022

I just spun one up, but I did it by hand, will see if it fails.

@rhatdan
Copy link
Member

rhatdan commented Apr 7, 2022

#3905

@TomSweeneyRedHat
Copy link
Member

Thx @rhatdan !

flouthoc added a commit to flouthoc/podman that referenced this pull request Apr 7, 2022
A new version of buildah was released after containers/buildah#3903
which is using race-free deps so use that.

Signed-off-by: Aditya R <arajan@redhat.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 10, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants