diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-12-18 15:16:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-18 15:16:05 +0000 |
| commit | 5c6b5ef34905f40562b518799c35be8d06694e65 (patch) | |
| tree | ca34417ff972421d4956e1e3a4594b6508f2b24d /pkg/api/server | |
| parent | a73c76df29a022a05d71c351244fe6e54504edc2 (diff) | |
| parent | 641272d41107f61d996ed71b6f5905e4287dda5a (diff) | |
| download | podman-5c6b5ef34905f40562b518799c35be8d06694e65.tar.gz podman-5c6b5ef34905f40562b518799c35be8d06694e65.tar.bz2 podman-5c6b5ef34905f40562b518799c35be8d06694e65.zip | |
Merge pull request #8747 from vrothberg/run-950
remote copy
Diffstat (limited to 'pkg/api/server')
| -rw-r--r-- | pkg/api/server/register_archive.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkg/api/server/register_archive.go b/pkg/api/server/register_archive.go index b2d2543c4..9ff0ad0eb 100644 --- a/pkg/api/server/register_archive.go +++ b/pkg/api/server/register_archive.go @@ -4,7 +4,6 @@ import ( "net/http" "github.com/containers/podman/v2/pkg/api/handlers/compat" - "github.com/containers/podman/v2/pkg/api/handlers/libpod" "github.com/gorilla/mux" ) @@ -92,7 +91,7 @@ func (s *APIServer) registerAchiveHandlers(r *mux.Router) error { Libpod */ - // swagger:operation POST /libpod/containers/{name}/copy libpod libpodPutArchive + // swagger:operation POST /libpod/containers/{name}/archive libpod libpodPutArchive // --- // summary: Copy files into a container // description: Copy a tar archive of files into a container @@ -133,7 +132,7 @@ func (s *APIServer) registerAchiveHandlers(r *mux.Router) error { // 500: // $ref: "#/responses/InternalError" - // swagger:operation GET /libpod/containers/{name}/copy libpod libpodGetArchive + // swagger:operation GET /libpod/containers/{name}/archive libpod libpodGetArchive // --- // summary: Copy files from a container // description: Copy a tar archive of files from a container @@ -164,8 +163,7 @@ func (s *APIServer) registerAchiveHandlers(r *mux.Router) error { // $ref: "#/responses/NoSuchContainer" // 500: // $ref: "#/responses/InternalError" - r.HandleFunc(VersionedPath("/libpod/containers/{name}/copy"), s.APIHandler(libpod.Archive)).Methods(http.MethodGet, http.MethodPost) - r.HandleFunc(VersionedPath("/libpod/containers/{name}/archive"), s.APIHandler(libpod.Archive)).Methods(http.MethodGet, http.MethodPost) + r.HandleFunc(VersionedPath("/libpod/containers/{name}/archive"), s.APIHandler(compat.Archive)).Methods(http.MethodGet, http.MethodPut, http.MethodHead) return nil } |