Merge branch 'master' into fix-filter-volumes

apis/server/container_bridge.go

@@ -351,6 +351,27 @@ func (s *Server) logsContainer(ctx context.Context, rw http.ResponseWriter, req
 	return nil
 }
 
+func (s *Server) statsContainer(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
+	name := mux.Vars(req)["name"]
+
+	var stream bool
+	if _, ok := req.Form["stream"]; !ok {
+		stream = true
+	}
+	stream = httputils.BoolValue(req, "stream")
+
+	if !stream {
+		rw.Header().Set("Content-Type", "application/json")
+	}
+
+	config := &mgr.ContainerStatsConfig{
+		Stream:    stream,
+		OutStream: rw,
+	}
+
+	return s.ContainerMgr.StreamStats(ctx, name, config)
+}
+
 func (s *Server) resizeContainer(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
 	height, err := strconv.Atoi(req.FormValue("h"))
 	if err != nil {

apis/server/exec_bridge.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strconv"
 
 	"github.com/alibaba/pouch/apis/types"
 	"github.com/alibaba/pouch/daemon/mgr"
@@ -93,3 +94,30 @@ func (s *Server) getExecInfo(ctx context.Context, rw http.ResponseWriter, req *h
 	}
 	return EncodeResponse(rw, http.StatusOK, execInfo)
 }
+
+func (s *Server) resizeExec(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
+	height, err := strconv.Atoi(req.FormValue("h"))
+	if err != nil {
+		return httputils.NewHTTPError(err, http.StatusBadRequest)
+	}
+
+	width, err := strconv.Atoi(req.FormValue("w"))
+	if err != nil {
+		return httputils.NewHTTPError(err, http.StatusBadRequest)
+	}
+
+	opts := types.ResizeOptions{
+		Height: int64(height),
+		Width:  int64(width),
+	}
+
+	name := mux.Vars(req)["name"]
+
+	if err := s.ContainerMgr.ResizeExec(ctx, name, opts); err != nil {
+		return err
+	}
+
+	rw.WriteHeader(http.StatusOK)
+	return nil
+
+}

apis/server/router.go

@@ -47,6 +47,7 @@ func initRoute(s *Server) http.Handler {
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/exec", s.createContainerExec)
 	s.addRoute(r, http.MethodGet, "/exec/{name:.*}/json", s.getExecInfo)
 	s.addRoute(r, http.MethodPost, "/exec/{name:.*}/start", s.startContainerExec)
+	s.addRoute(r, http.MethodPost, "/exec/{name:.*}/resize", s.resizeExec)
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/rename", s.renameContainer)
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/restart", s.restartContainer)
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/pause", s.pauseContainer)
@@ -55,6 +56,7 @@ func initRoute(s *Server) http.Handler {
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/upgrade", s.upgradeContainer)
 	s.addRoute(r, http.MethodGet, "/containers/{name:.*}/top", s.topContainer)
 	s.addRoute(r, http.MethodGet, "/containers/{name:.*}/logs", withCancelHandler(s.logsContainer))
+	s.addRoute(r, http.MethodGet, "/containers/{name:.*}/stats", withCancelHandler(s.statsContainer))
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/resize", s.resizeContainer)
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/restart", s.restartContainer)
 	s.addRoute(r, http.MethodPost, "/containers/{name:.*}/wait", withCancelHandler(s.waitContainer))