diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-25 10:42:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-25 10:42:23 -0400 |
| commit | dbd4ee04b8dca865e6001d94565755fae60089c9 (patch) | |
| tree | 9ba65731274883cc61f87adf7128580f87139e3f /pkg/bindings | |
| parent | af01cd06dd2b8da743c5a52cb43b53fcfaef648f (diff) | |
| parent | c3677f5151df0437a385a8e0d195b462a7c2c792 (diff) | |
| download | podman-dbd4ee04b8dca865e6001d94565755fae60089c9.tar.gz podman-dbd4ee04b8dca865e6001d94565755fae60089c9.tar.bz2 podman-dbd4ee04b8dca865e6001d94565755fae60089c9.zip | |
Merge pull request #14358 from vrothberg/todo-part-2
Todo part 2
Diffstat (limited to 'pkg/bindings')
| -rw-r--r-- | pkg/bindings/containers/archive.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/play/play.go | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/pkg/bindings/containers/archive.go b/pkg/bindings/containers/archive.go index 4f4b5a36a..dd489d6f1 100644 --- a/pkg/bindings/containers/archive.go +++ b/pkg/bindings/containers/archive.go @@ -55,8 +55,6 @@ func CopyFromArchive(ctx context.Context, nameOrID string, path string, reader i } // CopyFromArchiveWithOptions copy files into container -// -// FIXME: remove this function and make CopyFromArchive accept the option as the last parameter in podman 4.0 func CopyFromArchiveWithOptions(ctx context.Context, nameOrID string, path string, reader io.Reader, options *CopyOptions) (entities.ContainerCopyFunc, error) { conn, err := bindings.GetClient(ctx) if err != nil { diff --git a/pkg/bindings/play/play.go b/pkg/bindings/play/play.go index 8058a8514..0261b0250 100644 --- a/pkg/bindings/play/play.go +++ b/pkg/bindings/play/play.go @@ -46,7 +46,6 @@ func KubeWithBody(ctx context.Context, body io.Reader, options *KubeOptions) (*e params.Set("start", strconv.FormatBool(options.GetStart())) } - // TODO: have a global system context we can pass around (1st argument) header, err := auth.MakeXRegistryAuthHeader(&types.SystemContext{AuthFilePath: options.GetAuthfile()}, options.GetUsername(), options.GetPassword()) if err != nil { return nil, err |