github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

mount: fix read-only bind (#1368)

Browse Source 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
This commit is contained in:
Akihiro Suda
2017-08-17 02:53:25 +00:00
parent b4cc42d028
commit a560e5e0ef
6 changed files with 112 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
container_test.go
View File

@@ -704,7 +704,12 @@ func TestContainerExecNoBinaryExists(t *testing.T) {
func TestUserNamespaces(t *testing.T) {
t.Parallel()
t.Run("WritableRootFS", func(t *testing.T) { testUserNamespaces(t, false) })
// see #1373 and runc#1572
t.Run("ReadonlyRootFS", func(t *testing.T) { testUserNamespaces(t, true) })
}
func testUserNamespaces(t *testing.T, readonlyRootFS bool) {
client, err := newClient(t, address)
if err != nil {
t.Fatal(err)
@@ -714,7 +719,7 @@ func TestUserNamespaces(t *testing.T) {
var (
image Image
ctx, cancel = testContext()
id = t.Name()
id = strings.Replace(t.Name(), "/", "-", -1)
)
defer cancel()
@@ -726,13 +731,17 @@ func TestUserNamespaces(t *testing.T) {
}
}
container, err := client.NewContainer(ctx, id,
WithNewSpec(withImageConfig(image),
withExitStatus(7),
withUserNamespace(0, 1000, 10000),
),
withRemappedSnapshot(id, image, 1000, 1000),
)
opts := []NewContainerOpts{WithNewSpec(withImageConfig(image),
withExitStatus(7),
withUserNamespace(0, 1000, 10000),
)}
if readonlyRootFS {
opts = append(opts, withRemappedSnapshotView(id, image, 1000, 1000))
} else {
opts = append(opts, withRemappedSnapshot(id, image, 1000, 1000))
}
container, err := client.NewContainer(ctx, id, opts...)
if err != nil {
t.Error(err)
return