mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
gvproxy: Update to 0.7.2 release
This updates the Windows installer and macOS installer to ship the newer binaries, as well as the vendored gvisor-tap-vsock code. [NO NEW TESTS NEEDED] Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
64
vendor/github.com/containers/gvisor-tap-vsock/pkg/types/version.go
generated
vendored
Normal file
64
vendor/github.com/containers/gvisor-tap-vsock/pkg/types/version.go
generated
vendored
Normal file
@@ -0,0 +1,64 @@
|
||||
package types
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"runtime/debug"
|
||||
"strings"
|
||||
)
|
||||
|
||||
var (
|
||||
// set using the '-X github.com/containers/gvisor-tap-vsock/pkg/types.gitVersion' linker flag
|
||||
gitVersion = ""
|
||||
// set through .gitattributes when `git archive` is used
|
||||
// see https://icinga.com/blog/2022/05/25/embedding-git-commit-information-in-go-binaries/
|
||||
gitArchiveVersion = "$Format:%(describe)$"
|
||||
)
|
||||
|
||||
type version struct {
|
||||
binaryName string
|
||||
showVersion bool
|
||||
}
|
||||
|
||||
func NewVersion(binaryName string) *version { //nolint:revive
|
||||
return &version{
|
||||
binaryName: binaryName,
|
||||
}
|
||||
}
|
||||
|
||||
func (ver *version) String() string {
|
||||
return fmt.Sprintf("%s version %s", ver.binaryName, moduleVersion())
|
||||
}
|
||||
|
||||
func (ver *version) AddFlag() {
|
||||
flag.BoolVar(&ver.showVersion, "version", false, "Print version information")
|
||||
}
|
||||
|
||||
func (ver *version) ShowVersion() bool {
|
||||
return ver.showVersion
|
||||
}
|
||||
|
||||
func moduleVersion() string {
|
||||
switch {
|
||||
// This will be substituted when building from a GitHub tarball
|
||||
case !strings.HasPrefix(gitArchiveVersion, "$Format:"):
|
||||
return gitArchiveVersion
|
||||
// This will be set when building from git using make
|
||||
case gitVersion != "":
|
||||
return gitVersion
|
||||
// moduleVersionFromBuildInfo() will be set when using `go install`
|
||||
default:
|
||||
return moduleVersionFromBuildInfo()
|
||||
}
|
||||
}
|
||||
|
||||
func moduleVersionFromBuildInfo() string {
|
||||
info, ok := debug.ReadBuildInfo()
|
||||
if !ok {
|
||||
return ""
|
||||
}
|
||||
if info.Main.Version == "(devel)" {
|
||||
return ""
|
||||
}
|
||||
return info.Main.Version
|
||||
}
|
||||
1
vendor/github.com/coreos/stream-metadata-go/release/release.go
generated
vendored
1
vendor/github.com/coreos/stream-metadata-go/release/release.go
generated
vendored
@@ -53,6 +53,7 @@ type Arch struct {
|
||||
// Media contains release details for various platforms
|
||||
type Media struct {
|
||||
Aliyun *PlatformAliyun `json:"aliyun"`
|
||||
AppleHV *PlatformBase `json:"applehv"`
|
||||
Aws *PlatformAws `json:"aws"`
|
||||
Azure *PlatformBase `json:"azure"`
|
||||
AzureStack *PlatformBase `json:"azurestack"`
|
||||
|
||||
7
vendor/github.com/coreos/stream-metadata-go/release/translate.go
generated
vendored
7
vendor/github.com/coreos/stream-metadata-go/release/translate.go
generated
vendored
@@ -58,6 +58,13 @@ func (releaseArch *Arch) toStreamArch(rel *Release) stream.Arch {
|
||||
}
|
||||
}
|
||||
|
||||
if releaseArch.Media.AppleHV != nil {
|
||||
artifacts["applehv"] = stream.PlatformArtifacts{
|
||||
Release: rel.Release,
|
||||
Formats: mapFormats(releaseArch.Media.AppleHV.Artifacts),
|
||||
}
|
||||
}
|
||||
|
||||
if releaseArch.Media.Aws != nil {
|
||||
artifacts["aws"] = stream.PlatformArtifacts{
|
||||
Release: rel.Release,
|
||||
|
||||
Reference in New Issue
Block a user