diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-16 13:10:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-16 13:10:31 +0200 |
| commit | 14e0b40379a5446fce1f63140dd0e44a0a3e15ec (patch) | |
| tree | 355b9e705197e66a49ba8c5f959ae2719bbc42dc | |
| parent | 05149e659accb71429157fe33aa5daaf802d20d6 (diff) | |
| parent | 2eda50cb31d217db2339197c20c267f8e6d117c1 (diff) | |
| download | podman-14e0b40379a5446fce1f63140dd0e44a0a3e15ec.tar.gz podman-14e0b40379a5446fce1f63140dd0e44a0a3e15ec.tar.bz2 podman-14e0b40379a5446fce1f63140dd0e44a0a3e15ec.zip | |
Merge pull request #3805 from ashley-cui/tmpfs
Remove --tmpfs size default
| -rw-r--r-- | docs/podman-create.1.md | 2 | ||||
| -rw-r--r-- | docs/podman-run.1.md | 2 | ||||
| -rw-r--r-- | pkg/spec/storage.go | 4 | ||||
| -rw-r--r-- | pkg/util/mountOpts.go | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md index 50fca3541..6fe224bd4 100644 --- a/docs/podman-create.1.md +++ b/docs/podman-create.1.md @@ -715,7 +715,7 @@ $ podman run -d --tmpfs /tmp:rw,size=787448k,mode=1777 my_image This command mounts a `tmpfs` at `/tmp` within the container. The supported mount options are the same as the Linux default `mount` flags. If you do not specify any options, the systems uses the following options: -`rw,noexec,nosuid,nodev,size=65536k`. +`rw,noexec,nosuid,nodev`. **--tty**, **-t**=*true|false* diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index e7c898b25..4f6c3568b 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -752,7 +752,7 @@ $ podman run -d --tmpfs /tmp:rw,size=787448k,mode=1777 my_image This command mounts a `tmpfs` at `/tmp` within the container. The supported mount options are the same as the Linux default `mount` flags. If you do not specify any options, the systems uses the following options: -`rw,noexec,nosuid,nodev,size=65536k`. +`rw,noexec,nosuid,nodev`. **--tty**, **-t**=*true|false* diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index a8dc7f4a8..b634f4cac 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -168,14 +168,14 @@ func (config *CreateConfig) parseVolumes(runtime *libpod.Runtime) ([]spec.Mount, "/run": false, } if config.ReadOnlyRootfs && config.ReadOnlyTmpfs { - options := []string{"rw", "rprivate", "nosuid", "nodev", "tmpcopyup", "size=65536k"} + options := []string{"rw", "rprivate", "nosuid", "nodev", "tmpcopyup"} for dest := range readonlyTmpfs { if _, ok := baseMounts[dest]; ok { continue } localOpts := options if dest == "/run" { - localOpts = append(localOpts, "noexec") + localOpts = append(localOpts, "noexec", "size=65536k") } baseMounts[dest] = spec.Mount{ Destination: dest, diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index 40c99384d..9b2c734c0 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -92,9 +92,6 @@ func ProcessTmpfsOptions(options []string) ([]string, error) { if !foundWrite { baseOpts = append(baseOpts, "rw") } - if !foundSize { - baseOpts = append(baseOpts, "size=65536k") - } if !foundProp { baseOpts = append(baseOpts, "rprivate") } |