diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-01-10 15:58:18 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-11 12:39:06 +0000 |
| commit | dd0d35deb098b63f8c5be7ef9d8d63c16760221b (patch) | |
| tree | 695d44a49d636e45e4121c9aecfb3d8c0e1cca06 /cmd/podman/spec.go | |
| parent | e6be800ec633342aef656e0a2ed0bdc4519796d9 (diff) | |
| download | podman-dd0d35deb098b63f8c5be7ef9d8d63c16760221b.tar.gz podman-dd0d35deb098b63f8c5be7ef9d8d63c16760221b.tar.bz2 podman-dd0d35deb098b63f8c5be7ef9d8d63c16760221b.zip | |
Add support for shm-size.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #206
Approved by: TomSweeneyRedHat
Diffstat (limited to 'cmd/podman/spec.go')
| -rw-r--r-- | cmd/podman/spec.go | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/cmd/podman/spec.go b/cmd/podman/spec.go index 342b80d9e..d630b2f50 100644 --- a/cmd/podman/spec.go +++ b/cmd/podman/spec.go @@ -189,7 +189,13 @@ func addDevice(g *generate.Generator, device string) error { // Parses information needed to create a container into an OCI runtime spec func createConfigToOCISpec(config *createConfig) (*spec.Spec, error) { g := generate.New() - g.AddCgroupsMount("ro") + cgroupMnt := spec.Mount{ + Destination: "/sys/fs/cgroup", + Type: "cgroup", + Source: "cgroup", + Options: []string{"nosuid", "noexec", "nodev", "relatime", "ro"}, + } + g.AddMount(cgroupMnt) g.SetProcessCwd(config.WorkDir) g.SetProcessArgs(config.Command) g.SetProcessTerminal(config.Tty) @@ -273,6 +279,7 @@ func createConfigToOCISpec(config *createConfig) (*spec.Spec, error) { } for _, i := range config.Tmpfs { + // Default options if nothing passed options := []string{"rw", "noexec", "nosuid", "nodev", "size=65536k"} spliti := strings.SplitN(i, ":", 2) if len(spliti) > 1 { @@ -281,8 +288,13 @@ func createConfigToOCISpec(config *createConfig) (*spec.Spec, error) { } options = strings.Split(spliti[1], ",") } - // Default options if nothing passed - g.AddTmpfsMount(spliti[0], append(options, "tmpcopyup")) + tmpfsMnt := spec.Mount{ + Destination: spliti[0], + Type: "tmpfs", + Source: "tmpfs", + Options: append(options, "tmpcopyup"), + } + g.AddMount(tmpfsMnt) } for name, val := range config.Env { |