aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorCharlie Doern <cdoern@redhat.com>2022-08-22 14:25:10 -0400
committerMatthew Heon <mheon@redhat.com>2022-09-06 14:05:37 -0400
commit9d8c17ec08f472e1685a77abcbfce2fa5032ee7c (patch)
tree27f3a4971f15a7d4bf92936f998574d178790a71 /pkg
parent0ab8ebd1a8cd7a9bb458c7573030fa7c19f5406c (diff)
downloadpodman-9d8c17ec08f472e1685a77abcbfce2fa5032ee7c.tar.gz
podman-9d8c17ec08f472e1685a77abcbfce2fa5032ee7c.tar.bz2
podman-9d8c17ec08f472e1685a77abcbfce2fa5032ee7c.zip
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>
Diffstat (limited to 'pkg')
-rw-r--r--pkg/specgen/generate/container.go18
1 files changed, 15 insertions, 3 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index b6701b1ce..d43c1012f 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -400,9 +400,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
}
}