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

Update c/image and c/common to latest, c/buildah to main

Browse Source 
... to include https://github.com/containers/image/pull/2173,
https://github.com/containers/common/pull/1731
and https://github.com/containers/buildah/pull/5143 .

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2023-11-07 20:25:12 +01:00
parent 71aac2f430
commit ced07a55f4
65 changed files with 1138 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/github.com/containers/buildah/pkg/parse/parse.go generated vendored
View File

@@ -519,14 +519,10 @@ func DefaultPlatform() string {
// Platform separates the platform string into os, arch and variant,
// accepting any of $arch, $os/$arch, or $os/$arch/$variant.
func Platform(platform string) (os, arch, variant string, err error) {
if platform == "local" || platform == "" || platform == "/" {
platform = strings.Trim(platform, "/")
if platform == "local" || platform == "" {
return Platform(DefaultPlatform())
}
if platform[len(platform)-1] == '/' || platform[0] == '/' {
// If --platform string has format as `some/plat/string/`
// or `/some/plat/string` make it `some/plat/string`
platform = strings.Trim(platform, "/")
}
platformSpec, err := platforms.Parse(platform)
if err != nil {
return "", "", "", fmt.Errorf("invalid platform syntax for --platform=%q: %w", platform, err)
@@ -638,6 +634,11 @@ func GetBuildOutput(buildOutput string) (define.BuildOutputOption, error) {
return define.BuildOutputOption{Path: path, IsDir: isDir, IsStdout: isStdout}, nil
}
// TeeType parses a string value and returns a TeeType
func TeeType(teeType string) define.TeeType {
return define.TeeType(strings.ToLower(teeType))
}
// GetConfidentialWorkloadOptions parses a confidential workload settings
// argument, which controls both whether or not we produce an image that
// expects to be run using krun, and how we handle things like encrypting
@@ -651,7 +652,7 @@ func GetConfidentialWorkloadOptions(arg string) (define.ConfidentialWorkloadOpti
var err error
switch {
case strings.HasPrefix(option, "type="):
options.TeeType = define.TeeType(strings.ToLower(strings.TrimPrefix(option, "type=")))
options.TeeType = TeeType(strings.TrimPrefix(option, "type="))
switch options.TeeType {
case define.SEV, define.SNP, mkcwtypes.SEV_NO_ES:
default:
@@ -1069,6 +1070,7 @@ func isValidDeviceMode(mode string) bool {
return true
}
// GetTempDir returns the path of the preferred temporary directory on the host.
func GetTempDir() string {
return tmpdir.GetTempDir()
}