mirror of
https://github.com/containers/podman.git
synced 2025-12-02 19:17:00 +08:00
Bump to Buildah v1.40.0
Bumps to Buildah v1.40.0 and adds the `--inherits-labels` option to build and farm build man pages. Also turn off the inherit-labels option test for now as it seems to be rathr unhappy. Issue for inherit-labels test failure: https://github.com/containers/podman/issues/25938 Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
6
vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go
generated
vendored
6
vendor/github.com/containers/buildah/pkg/sshagent/sshagent.go
generated
vendored
@@ -38,7 +38,7 @@ func NewAgentServer(source *Source) (*AgentServer, error) {
|
||||
}
|
||||
|
||||
// newAgentServerKeyring creates a new agent from scratch and adds keys
|
||||
func newAgentServerKeyring(keys []interface{}) (*AgentServer, error) {
|
||||
func newAgentServerKeyring(keys []any) (*AgentServer, error) {
|
||||
a := agent.NewKeyring()
|
||||
for _, k := range keys {
|
||||
if err := a.Add(agent.AddedKey{PrivateKey: k}); err != nil {
|
||||
@@ -191,12 +191,12 @@ func (a *readOnlyAgent) Extension(_ string, _ []byte) ([]byte, error) {
|
||||
// The source of the forwarded agent can be from a socket on the host, or from individual key files
|
||||
type Source struct {
|
||||
Socket string
|
||||
Keys []interface{}
|
||||
Keys []any
|
||||
}
|
||||
|
||||
// NewSource takes paths and checks of they are keys or sockets, and creates a source
|
||||
func NewSource(paths []string) (*Source, error) {
|
||||
var keys []interface{}
|
||||
var keys []any
|
||||
var socket string
|
||||
if len(paths) == 0 {
|
||||
socket = os.Getenv("SSH_AUTH_SOCK")
|
||||
|
||||
Reference in New Issue
Block a user