Merge pull request #890 from Letty5411/restartdev

feature: add restart skeleton

apis/server/container_bridge.go

@@ -48,6 +48,11 @@ func (s *Server) renameContainer(ctx context.Context, rw http.ResponseWriter, re
 	return nil
 }
 
+func (s *Server) restartContainer(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
+	// TODO
+	return nil
+}
+
 func (s *Server) createContainerExec(ctx context.Context, rw http.ResponseWriter, req *http.Request) error {
 	config := &types.ExecCreateConfig{}
 	// decode request body

apis/server/router.go

@@ -39,6 +39,7 @@ func initRoute(s *Server) http.Handler {
 	r.Path(versionMatcher + "/containers/{name:.*}/exec").Methods(http.MethodPost).Handler(s.filter(s.createContainerExec))
 	r.Path(versionMatcher + "/exec/{name:.*}/start").Methods(http.MethodPost).Handler(s.filter(s.startContainerExec))
 	r.Path(versionMatcher + "/containers/{id:.*}/rename").Methods(http.MethodPost).Handler(s.filter(s.renameContainer))
+	r.Path("/containers/{id:.*}/restart").Methods(http.MethodPost).Handler(s.filter(s.restartContainer))
 	r.Path(versionMatcher + "/containers/{name:.*}/pause").Methods(http.MethodPost).Handler(s.filter(s.pauseContainer))
 	r.Path(versionMatcher + "/containers/{name:.*}/unpause").Methods(http.MethodPost).Handler(s.filter(s.unpauseContainer))
 	r.Path(versionMatcher + "/containers/{name:.*}/update").Methods(http.MethodPost).Handler(s.filter(s.updateContainer))

apis/swagger.yml

@@ -382,6 +382,30 @@ paths:
           $ref: "#/responses/500ErrorResponse"
       tags: ["Container"]
 
+  /containers/{id}/restart:
+    post:
+      summary: "Restart a container"
+      operationId: "ContainerRestart"
+      parameters:
+        - $ref: "#/parameters/id"
+        - name: "name"
+          in: "query"
+          required: true
+          description: "New name for the container"
+          type: "string"
+        - name: "t"
+          in: "query"
+          description: "Number of seconds to wait before killing the container"
+          type: "integer"
+      responses:
+        204:
+          description: "no error"
+        404:
+          $ref: "#/responses/404ErrorResponse"
+        500:
+          $ref: "#/responses/500ErrorResponse"
+      tags: ["Container"]
+
   /containers/{id}/start:
     post:
       summary: "Start a container"

cli/main.go

@@ -20,6 +20,7 @@ func main() {
 	cli.AddCommand(base, &StopCommand{})
 	cli.AddCommand(base, &PsCommand{})
 	cli.AddCommand(base, &RmCommand{})
+	cli.AddCommand(base, &RestartCommand{})
 	cli.AddCommand(base, &ExecCommand{})
 	cli.AddCommand(base, &VersionCommand{})
 	cli.AddCommand(base, &InfoCommand{})

cli/restart.go

@@ -0,0 +1,61 @@
+package main
+
+import (
+	"context"
+
+	"fmt"
+	"github.com/spf13/cobra"
+)
+
+// restartDescription is used to describe restart command in detail and auto generate command doc.
+var restartDescription = "restart one or more containers"
+
+// RestartCommand uses to implement 'restart' command, it restarts one or more containers.
+type RestartCommand struct {
+	baseCommand
+	timeout int
+}
+
+// Init initialize restart command.
+func (rc *RestartCommand) Init(c *Cli) {
+	rc.cli = c
+
+	rc.cmd = &cobra.Command{
+		Use:   "restart [OPTION] CONTAINER [CONTAINERS]",
+		Short: "restart one or more containers",
+		Long:  restartDescription,
+		Args:  cobra.MinimumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return rc.runRestart(args)
+		},
+		Example: restartExample(),
+	}
+	rc.addFlags()
+}
+
+// addFlags adds flags for specific command.
+func (rc *RestartCommand) addFlags() {
+	flagSet := rc.cmd.Flags()
+	flagSet.IntVarP(&rc.timeout, "time", "t", 10,
+		"Seconds to wait for stop before killing the container (default 10)")
+}
+
+// runRestart is the entry of restart command.
+func (rc *RestartCommand) runRestart(args []string) error {
+	ctx := context.Background()
+	apiClient := rc.cli.Client()
+
+	for _, name := range args {
+		if err := apiClient.ContainerRestart(ctx, name, rc.timeout); err != nil {
+			return fmt.Errorf("failed to restart container: %v", err)
+		}
+		fmt.Printf("%s\n", name)
+	}
+
+	return nil
+}
+
+// restartExample shows examples in restart command, and is used in auto-generated cli docs.
+func restartExample() string {
+	return `//TODO`
+}

client/container.go

@@ -159,6 +159,12 @@ func (client *APIClient) ContainerRename(ctx context.Context, id string, name st
 	return err
 }
 
+// ContainerRestart restarts a contianer.
+func (client *APIClient) ContainerRestart(ctx context.Context, name string, time int) error {
+	// TODO
+	return nil
+}
+
 // ContainerPause pauses a container.
 func (client *APIClient) ContainerPause(ctx context.Context, name string) error {
 	resp, err := client.post(ctx, "/containers/"+name+"/pause", nil, nil, nil)

client/interface.go

@@ -30,6 +30,7 @@ type ContainerAPIClient interface {
 	ContainerStartExec(ctx context.Context, execid string, config *types.ExecStartConfig) (net.Conn, *bufio.Reader, error)
 	ContainerGet(ctx context.Context, name string) (*types.ContainerJSON, error)
 	ContainerRename(ctx context.Context, id string, name string) error
+	ContainerRestart(ctx context.Context, name string, time int) error
 	ContainerPause(ctx context.Context, name string) error
 	ContainerUnpause(ctx context.Context, name string) error
 	ContainerUpdate(ctx context.Context, name string, config *types.UpdateConfig) error