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

Revert Patch to relabel if selinux not enabled #10253

Merged
merged 1 commit into from
May 7, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented May 6, 2021

Revert : #9895

Turns out that if Docker is in --selinux-enabeled, it still relabels if
the user tells the system to, even if running a --privileged container
or if the selinux separation is disabled --security-opt label=disable.

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 6, 2021
@rhatdan
Copy link
Member Author

rhatdan commented May 6, 2021

@dustymabe PTAL

Copy link
Contributor

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

LGTM

@dustymabe
Copy link
Contributor

@rhatdan - we may want to consider keeping the tests and adjusting them to the correct behavior (now that we know what that is).

@rhatdan
Copy link
Member Author

rhatdan commented May 6, 2021

@tunacado Could you point me back to the original issue that caused us to change the labeling practice. I might have to add a containers.conf option to give you what you want.

@rhatdan
Copy link
Member Author

rhatdan commented May 6, 2021

Fixes: #10209

@rhatdan rhatdan force-pushed the relabel branch 3 times, most recently from 48c9645 to 88421fb Compare May 6, 2021 21:59
Revert : containers#9895

Turns out that if Docker is in --selinux-enabeled, it still relabels if
the user tells the system to, even if running a --privileged container
or if the selinux separation is disabled --security-opt label=disable.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dustymabe, giuseppe, 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

@giuseppe
Copy link
Member

giuseppe commented May 7, 2021

@rhatdan good to merge?

/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 7, 2021
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 7, 2021
@rhatdan
Copy link
Member Author

rhatdan commented May 7, 2021

Yes we can merge. But I need feedback from @tunacado about the next step.
/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 7, 2021
@openshift-merge-robot openshift-merge-robot merged commit 663ea96 into containers:master May 7, 2021
@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 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 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. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants