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

Merge pull request #221 from ijc/writeable-rootfs-snapshot

Browse Source 
Always use a writeable snapshot as the rootfs.
This commit is contained in:
Lantao Liu 2017-09-06 15:10:28 -07:00 committed by GitHub
commit 34319e025f
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/server/container_create.go
View File

@ -112,12 +112,12 @@ func (c *criContainerdService) CreateContainer(ctx context.Context, r *runtime.C
opts := []containerd.NewContainerOpts{ opts := []containerd.NewContainerOpts{
containerd.WithSnapshotter(c.snapshotter), containerd.WithSnapshotter(c.snapshotter),
} }
// Prepare container rootfs. // Prepare container rootfs. This is always writeable even if
if config.GetLinux().GetSecurityContext().GetReadonlyRootfs() { // the container wants a readonly rootfs since we want to give
opts = append(opts, containerd.WithNewSnapshotView(id, image.Image)) // the runtime (runc) a chance to modify (e.g. to create mount
} else { // points corresponding to spec.Mounts) before making the
opts = append(opts, containerd.WithNewSnapshot(id, image.Image)) // rootfs readonly (requested by spec.Root.Readonly).
} opts = append(opts, containerd.WithNewSnapshot(id, image.Image))
meta.ImageRef = image.ID meta.ImageRef = image.ID
// Create container root directory. // Create container root directory.

3
pkg/server/sandbox_run.go
View File

@ -132,6 +132,9 @@ func (c *criContainerdService) RunPodSandbox(ctx context.Context, r *runtime.Run
} }
opts := []containerd.NewContainerOpts{ opts := []containerd.NewContainerOpts{
containerd.WithSnapshotter(c.snapshotter), containerd.WithSnapshotter(c.snapshotter),
// A pure ro rootfs view is OK for the sandbox since
// we will never need to modify it or mount anything
// in it.
containerd.WithNewSnapshotView(id, image.Image), containerd.WithNewSnapshotView(id, image.Image),
containerd.WithSpec(spec, specOpts...), containerd.WithSpec(spec, specOpts...),
containerd.WithContainerLabels(labels), containerd.WithContainerLabels(labels),