opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3805 from ashley-cui/tmpfs

Browse Source 
Remove --tmpfs size default
This commit is contained in:
OpenShift Merge Robot
2019-08-16 13:10:31 +02:00
committed by GitHub
parent 05149e659a 2eda50cb31
commit 14e0b40379
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/podman-create.1.md
View File

@ -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 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 options are the same as the Linux default `mount` flags. If you do not specify
any options, the systems uses the following options: any options, the systems uses the following options:
`rw,noexec,nosuid,nodev,size=65536k`. `rw,noexec,nosuid,nodev`.
**--tty**, **-t**=*true|false* **--tty**, **-t**=*true|false*

2
docs/podman-run.1.md
View File

@ -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 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 options are the same as the Linux default `mount` flags. If you do not specify
any options, the systems uses the following options: any options, the systems uses the following options:
`rw,noexec,nosuid,nodev,size=65536k`. `rw,noexec,nosuid,nodev`.
**--tty**, **-t**=*true|false* **--tty**, **-t**=*true|false*

4
pkg/spec/storage.go
View File

@ -168,14 +168,14 @@ func (config *CreateConfig) parseVolumes(runtime *libpod.Runtime) ([]spec.Mount,
"/run": false, "/run": false,
} }
if config.ReadOnlyRootfs && config.ReadOnlyTmpfs { 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 { for dest := range readonlyTmpfs {
if _, ok := baseMounts[dest]; ok { if _, ok := baseMounts[dest]; ok {
continue continue
} }
localOpts := options localOpts := options
if dest == "/run" { if dest == "/run" {
localOpts = append(localOpts, "noexec") localOpts = append(localOpts, "noexec", "size=65536k")
} }
baseMounts[dest] = spec.Mount{ baseMounts[dest] = spec.Mount{
Destination: dest, Destination: dest,

3
pkg/util/mountOpts.go
View File

@ -92,9 +92,6 @@ func ProcessTmpfsOptions(options []string) ([]string, error) {
if !foundWrite { if !foundWrite {
baseOpts = append(baseOpts, "rw") baseOpts = append(baseOpts, "rw")
} }
if !foundSize {
baseOpts = append(baseOpts, "size=65536k")
}
if !foundProp { if !foundProp {
baseOpts = append(baseOpts, "rprivate") baseOpts = append(baseOpts, "rprivate")
} }