opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 20:23:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

run,create: modify --env-merge behavior for non-existent vars

Browse Source 
Signed-off-by: danishprakash <danish.prakash@suse.com>
This commit is contained in:
danishprakash
2023-06-22 11:29:20 +05:30
parent dba9283269
commit bd69b151fa
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/markdown/options/env-merge.md
View File

@ -7,3 +7,7 @@
Preprocess default environment variables for the containers. For example Preprocess default environment variables for the containers. For example
if image contains environment variable `hello=world` user can preprocess if image contains environment variable `hello=world` user can preprocess
it using `--env-merge hello=${hello}-some` so new value is `hello=world-some`. it using `--env-merge hello=${hello}-some` so new value is `hello=world-some`.
Please note that if the environment variable `hello` is not present in the image,
then it'll be replaced by an empty string and so using `--env-merge hello=${hello}-some`
would result in the new value of `hello=-some`, notice the leading `-` delimiter.

12
pkg/specgen/generate/container.go
View File

@ -135,10 +135,16 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to process variables for --env-merge %s: %w", e, err) return nil, fmt.Errorf("unable to process variables for --env-merge %s: %w", e, err)
} }
splitWord := strings.Split(processedWord, "=")
if _, ok := defaultEnvs[splitWord[0]]; ok { key, val, found := strings.Cut(processedWord, "=")
defaultEnvs[splitWord[0]] = splitWord[1] if !found {
return nil, fmt.Errorf("missing `=` for --env-merge substitution %s", e)
} }
// the env var passed via --env-merge
// need not be defined in the image
// continue with an empty string
defaultEnvs[key] = val
} }
for _, e := range s.UnsetEnv { for _, e := range s.UnsetEnv {

5
test/e2e/run_env_test.go
View File

@ -76,6 +76,11 @@ ENV hello=world
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring("world-earth")) Expect(session.OutputToString()).To(ContainSubstring("world-earth"))
session = podmanTest.Podman([]string{"run", "--rm", "--env-merge", "foo=${bar}-earth", "test", "printenv", "foo"})
session.WaitWithDefaultTimeout()
Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(Equal("-earth"))
}) })
It("podman run --env-host environment test", func() { It("podman run --env-host environment test", func() {