mirror of https://github.com/containers/podman.git
pass environment variables to container clone
the env vars are held in the spec rather than the config, so they need to be mapped manually. They are also of a different format so special handling needed to be added. All env from the parent container will now be passed to the clone. resolves #15242 Signed-off-by: Charlie Doern <cdoern@redhat.com>
This commit is contained in:
parent
aefd0aed39
commit
53369aaa15
|
@ -347,9 +347,21 @@ func ConfigToSpec(rt *libpod.Runtime, specg *specgen.SpecGenerator, contaierID s
|
|||
conf.Systemd = tmpSystemd
|
||||
conf.Mounts = tmpMounts
|
||||
|
||||
if conf.Spec != nil && conf.Spec.Linux != nil && conf.Spec.Linux.Resources != nil {
|
||||
if specg.ResourceLimits == nil {
|
||||
specg.ResourceLimits = conf.Spec.Linux.Resources
|
||||
if conf.Spec != nil {
|
||||
if conf.Spec.Linux != nil && conf.Spec.Linux.Resources != nil {
|
||||
if specg.ResourceLimits == nil {
|
||||
specg.ResourceLimits = conf.Spec.Linux.Resources
|
||||
}
|
||||
}
|
||||
if conf.Spec.Process != nil && conf.Spec.Process.Env != nil {
|
||||
env := make(map[string]string)
|
||||
for _, entry := range conf.Spec.Process.Env {
|
||||
split := strings.Split(entry, "=")
|
||||
if len(split) == 2 {
|
||||
env[split[0]] = split[1]
|
||||
}
|
||||
}
|
||||
specg.Env = env
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -292,4 +292,20 @@ var _ = Describe("Podman container clone", func() {
|
|||
Expect(ok).To(BeTrue())
|
||||
|
||||
})
|
||||
|
||||
It("podman container clone env test", func() {
|
||||
session := podmanTest.Podman([]string{"run", "--name", "env_ctr", "-e", "ENV_TEST=123", ALPINE, "printenv", "ENV_TEST"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
|
||||
session = podmanTest.Podman([]string{"container", "clone", "env_ctr"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
|
||||
session = podmanTest.Podman([]string{"start", "-a", "env_ctr-clone"})
|
||||
session.WaitWithDefaultTimeout()
|
||||
Expect(session).Should(Exit(0))
|
||||
Expect(session.OutputToString()).Should(ContainSubstring("123"))
|
||||
|
||||
})
|
||||
})
|
||||
|
|
Loading…
Reference in New Issue