-
Notifications
You must be signed in to change notification settings - Fork 18.6k
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
SEND CAPABILITY IDS TO LXC #10152
SEND CAPABILITY IDS TO LXC #10152
Conversation
Sending capability ids instead of capability names ot LXC for --cap-add and --cap-drop. Also fixed tests. Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
57a4c2c
to
bff3509
Compare
@ashahab-altiscale Thanks so much for the continual effort of fixing the tests :) Do you think there is a way to check the output differently for these so that it works for lxc as well, because it looks like they should be passing:
|
Odd, they all passed for me. I will have to check how its failing in
|
Oh I tested locally not on Jenkins. I am on Debian with Btrfs, but idk if On Sat, Jan 17, 2015 at 2:47 PM, Abin Shahab notifications@github.com
|
Its not an issue with output. Its just not working. If you want to dig more
|
I'll try again thanks On Saturday, January 17, 2015, Abin Shahab notifications@github.com wrote:
|
Jessie, Abin On Sat, Jan 17, 2015 at 3:25 PM, Jessie Frazelle notifications@github.com
|
Actually, please also make sure there are no old docker images lurking On Sat, Jan 17, 2015 at 8:39 PM, Abin Shahab ashahab@altiscale.com wrote:
|
@jfrazelle Any feedback on this? |
so sorry, going back through it all now |
I am running them again here so it is easier to show you the output I am seeing https://jenkins.dockerproject.com/job/LXC%20PR%20Test/label=ubuntu-aufs-lxc/1/console |
welp the tests work there so great :) |
LGTM |
@@ -986,7 +986,7 @@ func TestRunCapDropCannotMknodLowerCase(t *testing.T) { | |||
} | |||
|
|||
func TestRunCapDropALLCannotMknod(t *testing.T) { | |||
cmd := exec.Command(dockerBinary, "run", "--cap-drop=ALL", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok") | |||
cmd := exec.Command(dockerBinary, "run", "--cap-drop=ALL", "--cap-add=SETGID", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This may need a little explanation as to why we are special casing setgid in this test.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LXC cap-drop=ALL means it won't allow docker do any preliminary setup work, without SETGID.
LGTM |
Thanks @jfrazelle. So is https://jenkins.dockerproject.com/job/LXC%20PR%20Test a permanent set of jobs that I can check for my pull requests? The drone.io console logs are always from a native driver build I think. |
Not permanent, but I will probably trigger it if you open more PRs :) On Mon, Jan 19, 2015 at 10:05 AM, Abin Shahab notifications@github.com
|
But yes, the tests it runs are a better representation than drone, which On Mon, Jan 19, 2015 at 10:15 AM, Jessica Frazelle jess@docker.com wrote:
|
@ashahab-altiscale is this good to be merged? |
@crosbymichael yes it is ready to merge. |
OK, thanks! LGTM |
SEND CAPABILITY IDS TO LXC
Sending capability ids instead of capability names ot LXC for --cap-add and --cap-drop.
Also fixed tests.
Docker-DCO-1.1-Signed-off-by: Abin Shahab ashahab@altiscale.com (github: ashahab-altiscale)