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/domain | |
| 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/domain')
| -rw-r--r-- | pkg/domain/entities/pods.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 14ce370c1..33ca2c807 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -263,6 +263,7 @@ type ContainerCreateOptions struct { TTY bool Timezone string Umask string + EnvMerge []string UnsetEnv []string UnsetEnvAll bool UIDMap []string |