Skip to content

specgen: apply env_merge from containers.conf #28583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jiwahn wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −1
Draft

specgen: apply env_merge from containers.conf #28583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/specgen/generate/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
defaultEnvs["TERM"] = "xterm"
}

for _, e := range s.EnvMerge {
envMergeList := append(rtc.Containers.EnvMerge, s.EnvMerge...)

for _, e := range envMergeList {
processedWord, err := imagebuilder.ProcessWord(e, envLib.Slice(defaultEnvs))
if err != nil {
return nil, fmt.Errorf("unable to process variables for --env-merge %s: %w", e, err)
Expand Down
4 changes: 4 additions & 0 deletions test/e2e/config/containers.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ env = [
"foo=bar",
]

env_merge = [
"PODMAN_TEST_VAR=${PODMAN_TEST_VAR}-merged"
]

# container engines use container separation using MAC(SELinux) labeling.
# Flag is ignored on label disabled systems.
#
Expand Down
12 changes: 12 additions & 0 deletions test/e2e/containers_conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,18 @@ var _ = Describe("Verify podman containers.conf usage", func() {
Expect(session.OutputToString()).To(ContainSubstring("foo=bar"))
})

It("having env_merge from containers.conf", func() {
dockerfile := `FROM quay.io/libpod/alpine:latest
ENV PODMAN_TEST_VAR=original
`
podmanTest.BuildImage(dockerfile, "test-env-merge", "false")

session := podmanTest.Podman([]string{"run", "--rm", "test-env-merge", "printenv", "PODMAN_TEST_VAR"})
session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly())
Expect(session.OutputToString()).To(Equal("original-merged"))
})

It("additional devices", func() {
// containers.conf devices includes notone
session := podmanTest.Podman([]string{"run", "--device", "/dev/null:/dev/bar", ALPINE, "ls", "/dev"})
Expand Down