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

Merge pull request #3872 from liaojh1998/ctr-run-readonly

Browse Source 
Modify ctr run to search for read-only flag instead of readonly
This commit is contained in:
Phil Estes 2019-12-04 09:43:25 -05:00 committed by GitHub
commit 6ed7ec4472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/commands/run/run_unix.go
View File

@ -116,13 +116,13 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
cOpts = append(cOpts, cOpts = append(cOpts,
containerd.WithImage(image), containerd.WithImage(image),
containerd.WithSnapshotter(snapshotter), containerd.WithSnapshotter(snapshotter),
// Even when "readonly" is set, we don't use KindView snapshot here. (#1495) // Even when "read-only" is set, we don't use KindView snapshot here. (#1495)
// We pass writable snapshot to the OCI runtime, and the runtime remounts it as read-only, // We pass writable snapshot to the OCI runtime, and the runtime remounts it as read-only,
// after creating some mount points on demand. // after creating some mount points on demand.
containerd.WithNewSnapshot(id, image), containerd.WithNewSnapshot(id, image),
containerd.WithImageStopSignal(image, "SIGTERM")) containerd.WithImageStopSignal(image, "SIGTERM"))
} }
if context.Bool("readonly") { if context.Bool("read-only") {
opts = append(opts, oci.WithRootFSReadonly()) opts = append(opts, oci.WithRootFSReadonly())
} }
if len(args) > 0 { if len(args) > 0 {