diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-24 13:29:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-24 13:29:20 -0400 |
| commit | 361eb42619b2bccaf4fa7bb342dee779f72a512d (patch) | |
| tree | 61769980b62ffaaaefa2636f419e829eeb56762c /pkg/specgen | |
| parent | 2b05f4a0e6c05e4f653d86156858b4dff51a81b9 (diff) | |
| parent | 65efcdf709a83e6d013b4e65247750c97236d89a (diff) | |
| download | podman-361eb42619b2bccaf4fa7bb342dee779f72a512d.tar.gz podman-361eb42619b2bccaf4fa7bb342dee779f72a512d.tar.bz2 podman-361eb42619b2bccaf4fa7bb342dee779f72a512d.zip | |
Merge pull request #15434 from rhatdan/manifest1
Allow podman to run in an environment with keys containing spaces
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/container.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index e293ce010..d57efa0d1 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -152,10 +152,8 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat } // First transform the os env into a map. We need it for the labels later in // any case. - osEnv, err := envLib.ParseSlice(os.Environ()) - if err != nil { - return nil, fmt.Errorf("error parsing host environment variables: %w", err) - } + osEnv := envLib.Map(os.Environ()) + // Caller Specified defaults if s.EnvHost { defaultEnvs = envLib.Join(defaultEnvs, osEnv) |