summaryrefslogtreecommitdiff
path: root/pkg/api/server/register_exec.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-03-06 21:19:55 +0100
committerGitHub <noreply@github.com>2020-03-06 21:19:55 +0100
commitc3177b781b69b45e2a084b83d44c39abd8e94132 (patch)
treec0dfa81e817ce65ebfea730f7bc25bfb87543497 /pkg/api/server/register_exec.go
parent6365fab22bc519c6c16573e8407088215b42d435 (diff)
parent06f5664e9dc335e3cfc42475e8f807036312a801 (diff)
downloadpodman-c3177b781b69b45e2a084b83d44c39abd8e94132.tar.gz
podman-c3177b781b69b45e2a084b83d44c39abd8e94132.tar.bz2
podman-c3177b781b69b45e2a084b83d44c39abd8e94132.zip
Merge pull request #5410 from st1971/api-fixes
APIv2: compatible api fixes
Diffstat (limited to 'pkg/api/server/register_exec.go')
-rw-r--r--pkg/api/server/register_exec.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go
index ad62de3f5..76033a9ca 100644
--- a/pkg/api/server/register_exec.go
+++ b/pkg/api/server/register_exec.go
@@ -75,6 +75,8 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error {
// 500:
// $ref: "#/responses/InternalError"
r.Handle(VersionedPath("/containers/{name}/create"), s.APIHandler(handlers.CreateExec)).Methods(http.MethodPost)
+ // Added non version path to URI to support docker non versioned paths
+ r.Handle("/containers/{name}/create", s.APIHandler(handlers.CreateExec)).Methods(http.MethodPost)
// swagger:operation POST /exec/{id}/start compat startExec
// ---
// tags:
@@ -111,6 +113,8 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error {
// 500:
// $ref: "#/responses/InternalError"
r.Handle(VersionedPath("/exec/{id}/start"), s.APIHandler(handlers.StartExec)).Methods(http.MethodPost)
+ // Added non version path to URI to support docker non versioned paths
+ r.Handle("/exec/{id}/start", s.APIHandler(handlers.StartExec)).Methods(http.MethodPost)
// swagger:operation POST /exec/{id}/resize compat resizeExec
// ---
// tags:
@@ -142,6 +146,8 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error {
// 500:
// $ref: "#/responses/InternalError"
r.Handle(VersionedPath("/exec/{id}/resize"), s.APIHandler(handlers.ResizeExec)).Methods(http.MethodPost)
+ // Added non version path to URI to support docker non versioned paths
+ r.Handle("/exec/{id}/resize", s.APIHandler(handlers.ResizeExec)).Methods(http.MethodPost)
// swagger:operation GET /exec/{id}/json compat inspectExec
// ---
// tags:
@@ -164,6 +170,8 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error {
// 500:
// $ref: "#/responses/InternalError"
r.Handle(VersionedPath("/exec/{id}/json"), s.APIHandler(handlers.InspectExec)).Methods(http.MethodGet)
+ // Added non version path to URI to support docker non versioned paths
+ r.Handle("/exec/{id}/json", s.APIHandler(handlers.InspectExec)).Methods(http.MethodGet)
/*
libpod api follows