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 /docs | |
| 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 'docs')
| -rw-r--r-- | docs/source/markdown/options/env-merge.md | 5 | ||||
| -rw-r--r-- | docs/source/markdown/podman-create.1.md.in | 2 | ||||
| -rw-r--r-- | docs/source/markdown/podman-run.1.md.in | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/docs/source/markdown/options/env-merge.md b/docs/source/markdown/options/env-merge.md new file mode 100644 index 000000000..aa1aa003d --- /dev/null +++ b/docs/source/markdown/options/env-merge.md @@ -0,0 +1,5 @@ +#### **--env-merge**=*env* + +Preprocess default environment variables for the containers. For example +if image contains environment variable `hello=world` user can preprocess +it using `--env-merge hello=${hello}-some` so new value will be `hello=world-some`. diff --git a/docs/source/markdown/podman-create.1.md.in b/docs/source/markdown/podman-create.1.md.in index 7b02430e0..71935a647 100644 --- a/docs/source/markdown/podman-create.1.md.in +++ b/docs/source/markdown/podman-create.1.md.in @@ -208,6 +208,8 @@ Read in a line delimited file of environment variables. See **Environment** note @@option env-host +@@option env-merge + @@option expose @@option gidmap.container diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in index 8457a7fa6..16b5ffcab 100644 --- a/docs/source/markdown/podman-run.1.md.in +++ b/docs/source/markdown/podman-run.1.md.in @@ -243,6 +243,8 @@ Read in a line delimited file of environment variables. See **Environment** note @@option env-host +@@option env-merge + @@option expose @@option gidmap.container |