diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-22 05:40:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 05:40:32 -0400 |
| commit | 59bad8bf7176398dbab6b59867b17567691ffda3 (patch) | |
| tree | c2516dae009b868a21b3d81bd7711228d09a7f60 /cmd | |
| parent | 2643967bc04ee3ab9f8c204bb5a4258588d03ad9 (diff) | |
| parent | d4d3fbc155419f4017064a65e718ad78d50115cc (diff) | |
| download | podman-59bad8bf7176398dbab6b59867b17567691ffda3.tar.gz podman-59bad8bf7176398dbab6b59867b17567691ffda3.tar.bz2 podman-59bad8bf7176398dbab6b59867b17567691ffda3.zip | |
Merge pull request #7006 from ashley-cui/umask
Add --umask flag for create, run
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 5 | ||||
| -rw-r--r-- | cmd/podman/common/create_opts.go | 1 | ||||
| -rw-r--r-- | cmd/podman/common/specgen.go | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 6ebf58204..46f78cdba 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -463,6 +463,11 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "tz", containerConfig.TZ(), "Set timezone in container", ) + createFlags.StringVar( + &cf.Umask, + "umask", containerConfig.Umask(), + "Set umask in container", + ) createFlags.StringSliceVar( &cf.UIDMap, "uidmap", []string{}, diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index a544846aa..2bea8b0b4 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -93,6 +93,7 @@ type ContainerCLIOpts struct { TmpFS []string TTY bool Timezone string + Umask string UIDMap []string Ulimit []string User string diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 416c6f6ec..731085731 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -613,6 +613,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string s.Remove = c.Rm s.StopTimeout = &c.StopTimeout s.Timezone = c.Timezone + s.Umask = c.Umask return nil } |