diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-08 10:42:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 10:42:44 -0400 |
| commit | cdbc33112ef6407db1292f0a40778e6ac1d8996e (patch) | |
| tree | 071c7cc2744f62d007ee16419307932acb5e100a /pkg/api | |
| parent | 0c9c3e6714905fbb493e0b634e09b56ae096592e (diff) | |
| parent | dc17195bd9d1027b19c3e7f0975f17f4ebda408a (diff) | |
| download | podman-cdbc33112ef6407db1292f0a40778e6ac1d8996e.tar.gz podman-cdbc33112ef6407db1292f0a40778e6ac1d8996e.tar.bz2 podman-cdbc33112ef6407db1292f0a40778e6ac1d8996e.zip | |
Merge pull request #13687 from rhatdan/VENDOR
Vendor in new opencontainers/selinux
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/images_build.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 0ebf74f98..08646202a 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -95,6 +95,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { ForceRm bool `schema:"forcerm"` From string `schema:"from"` HTTPProxy bool `schema:"httpproxy"` + IdentityLabel bool `schema:"identitylabel"` Ignore bool `schema:"ignore"` Isolation string `schema:"isolation"` Jobs int `schema:"jobs"` // nolint @@ -126,10 +127,11 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { UnsetEnvs []string `schema:"unsetenv"` Secrets string `schema:"secrets"` }{ - Dockerfile: "Dockerfile", - Registry: "docker.io", - Rm: true, - ShmSize: 64 * 1024 * 1024, + Dockerfile: "Dockerfile", + IdentityLabel: true, + Registry: "docker.io", + Rm: true, + ShmSize: 64 * 1024 * 1024, } decoder := r.Context().Value(api.DecoderKey).(*schema.Decoder) @@ -522,6 +524,7 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { DNSSearch: dnssearch, DNSServers: dnsservers, HTTPProxy: query.HTTPProxy, + IdentityLabel: types.NewOptionalBool(query.IdentityLabel), LabelOpts: labelOpts, Memory: query.Memory, MemorySwap: query.MemSwap, |