diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-24 09:14:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 09:14:42 -0400 |
| commit | 67c4068bb35fd1aad95b1701c94ed11183d0fd66 (patch) | |
| tree | 19f9cc0bbbdd593cbb099c260bf6e395cd80d715 /pkg/api | |
| parent | 1bcceadca4850e8efd975d927a5586ad052207ac (diff) | |
| parent | b4584ea8546be227c74174130ec3a04a93996d28 (diff) | |
| download | podman-67c4068bb35fd1aad95b1701c94ed11183d0fd66.tar.gz podman-67c4068bb35fd1aad95b1701c94ed11183d0fd66.tar.bz2 podman-67c4068bb35fd1aad95b1701c94ed11183d0fd66.zip | |
Merge pull request #15443 from flouthoc/env-merge-support
run,create: add support for `--env-merge` for preprocessing default environment variables
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/containers_create.go | 1 | ||||
| -rw-r--r-- | pkg/api/handlers/types.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index 9fff8b4c8..d4f5d5f36 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -408,6 +408,7 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C Systemd: "true", // podman default TmpFS: parsedTmp, TTY: cc.Config.Tty, + EnvMerge: cc.EnvMerge, UnsetEnv: cc.UnsetEnv, UnsetEnvAll: cc.UnsetEnvAll, User: cc.Config.User, diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 6d245d950..aab905878 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -127,6 +127,7 @@ type CreateContainerConfig struct { dockerContainer.Config // desired container configuration HostConfig dockerContainer.HostConfig // host dependent configuration for container NetworkingConfig dockerNetwork.NetworkingConfig // network configuration for container + EnvMerge []string // preprocess env variables from image before injecting into containers UnsetEnv []string // unset specified default environment variables UnsetEnvAll bool // unset all default environment variables } |