opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-27 00:34:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set config environment variables early in Podman init

Browse Source 
Fixes: https://github.com/containers/podman/issues/12296

[NO NEW TESTS NEEDED] because there is no easy way to test this.
Tests are in containers/common.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2021-11-15 11:48:28 -05:00
parent cca6df428c
commit 364b242b70
7 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vendor/github.com/containers/common/libimage/manifests/manifests.go generated vendored
View File

@ -353,9 +353,12 @@ func (l *list) Add(ctx context.Context, sys *types.SystemContext, ref types.Imag
}
if instanceInfo.OS == "" {
instanceInfo.OS = config.OS
instanceInfo.OSVersion = config.OSVersion
instanceInfo.OSFeatures = config.OSFeatures
}
if instanceInfo.Architecture == "" {
instanceInfo.Architecture = config.Architecture
instanceInfo.Variant = config.Variant
}
}
manifestBytes, manifestType, err := src.GetManifest(ctx, instanceInfo.instanceDigest)