diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-08-10 08:57:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-10 08:57:58 +0000 |
| commit | 84502fc1447867aba66ea6725e22bb57cddce42c (patch) | |
| tree | 8fe47161286ee1bc7f677852799648cf3f7a5116 /cmd/podman/images/scp.go | |
| parent | c1eb9f65ac67d72f557e3770975b227657d31d4b (diff) | |
| parent | 280f5d8cb01d115618d5ef131c718496a3b4900e (diff) | |
| download | podman-84502fc1447867aba66ea6725e22bb57cddce42c.tar.gz podman-84502fc1447867aba66ea6725e22bb57cddce42c.tar.bz2 podman-84502fc1447867aba66ea6725e22bb57cddce42c.zip | |
Merge pull request #15094 from cdoern/ssh
podman ssh work, using new c/common interface
Diffstat (limited to 'cmd/podman/images/scp.go')
| -rw-r--r-- | cmd/podman/images/scp.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index a7aa43e61..18899d251 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -4,6 +4,7 @@ import ( "os" "strings" + "github.com/containers/common/pkg/ssh" "github.com/containers/podman/v4/cmd/podman/common" "github.com/containers/podman/v4/cmd/podman/registry" "github.com/spf13/cobra" @@ -48,6 +49,11 @@ func scp(cmd *cobra.Command, args []string) (finalErr error) { var ( err error ) + + containerConfig := registry.PodmanConfig() + + sshType := containerConfig.SSHMode + for i, val := range os.Args { if val == "image" { break @@ -67,7 +73,8 @@ func scp(cmd *cobra.Command, args []string) (finalErr error) { dst = args[1] } - err = registry.ImageEngine().Scp(registry.Context(), src, dst, parentFlags, quiet) + sshEngine := ssh.DefineMode(sshType) + err = registry.ImageEngine().Scp(registry.Context(), src, dst, parentFlags, quiet, sshEngine) if err != nil { return err } |