diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-22 17:34:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-22 17:34:22 +0200 |
| commit | f53234a67eac066e3ea59ed225b866e0597debb9 (patch) | |
| tree | 5aa69d0833243b66da0b8ad939b94ef01724702d | |
| parent | d1f432dd566a8ccf69b4a36f8677273ad6a1feed (diff) | |
| parent | 5a80770e8e4e0150a57a9870dd9cbf2c85dafb6e (diff) | |
| download | podman-f53234a67eac066e3ea59ed225b866e0597debb9.tar.gz podman-f53234a67eac066e3ea59ed225b866e0597debb9.tar.bz2 podman-f53234a67eac066e3ea59ed225b866e0597debb9.zip | |
Merge pull request #15040 from Luap99/api-umask
API: libpod/create use correct default umask
| -rw-r--r-- | pkg/api/handlers/libpod/containers_create.go | 3 | ||||
| -rw-r--r-- | test/apiv2/20-containers.at | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/api/handlers/libpod/containers_create.go b/pkg/api/handlers/libpod/containers_create.go index e4964d602..1307c267a 100644 --- a/pkg/api/handlers/libpod/containers_create.go +++ b/pkg/api/handlers/libpod/containers_create.go @@ -31,6 +31,9 @@ func CreateContainer(w http.ResponseWriter, r *http.Request) { ContainerNetworkConfig: specgen.ContainerNetworkConfig{ UseImageHosts: conf.Containers.NoHosts, }, + ContainerSecurityConfig: specgen.ContainerSecurityConfig{ + Umask: conf.Containers.Umask, + }, } if err := json.NewDecoder(r.Body).Decode(&sg); err != nil { diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index 6ef4ef917..a8d9baef3 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -123,7 +123,8 @@ t GET libpod/containers/${cid}/json 200 \ .Id=$cid \ .State.Status~\\\(exited\\\|stopped\\\) \ .State.Running=false \ - .State.ExitCode=0 + .State.ExitCode=0 \ + .Config.Umask=0022 # regression check for #15036 t DELETE libpod/containers/$cid 200 .[0].Id=$cid CNAME=myfoo |