Merge pull request #99 from docker/feat-stop

Add `Stop` command on the gRPC side.

azure/backend.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/docker/api/context/cloud"
+	"github.com/docker/api/errdefs"
 
 	"github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance"
 	"github.com/compose-spec/compose-go/types"
@@ -101,7 +102,7 @@ type aciContainerService struct {
 	ctx                   store.AciContext
 }
 
-func (cs *aciContainerService) List(ctx context.Context) ([]containers.Container, error) {
+func (cs *aciContainerService) List(ctx context.Context, _ bool) ([]containers.Container, error) {
 	var containerGroups []containerinstance.ContainerGroup
 	result, err := cs.containerGroupsClient.ListByResourceGroup(ctx, cs.ctx.ResourceGroup)
 	if err != nil {
@@ -177,6 +178,10 @@ func (cs *aciContainerService) Run(ctx context.Context, r containers.ContainerCo
 	return createACIContainers(ctx, cs.ctx, groupDefinition)
 }
 
+func (cs *aciContainerService) Stop(ctx context.Context, containerName string, timeout *uint32) error {
+	return errdefs.ErrNotImplemented
+}
+
 func getGroupAndContainerName(containerID string) (groupName string, containerName string) {
 	tokens := strings.Split(containerID, "_")
 	groupName = tokens[0]

cli/cmd/ps.go

@@ -15,6 +15,7 @@ import (
 )
 
 type psOpts struct {
+	all   bool
 	quiet bool
 }
 
@@ -30,6 +31,7 @@ func PsCommand() *cobra.Command {
 	}
 
 	cmd.Flags().BoolVarP(&opts.quiet, "quiet", "q", false, "Only display IDs")
+	cmd.Flags().BoolVarP(&opts.all, "all", "a", false, "Show all containers (default shows just running)")
 
 	return cmd
 }
@@ -40,7 +42,7 @@ func runPs(ctx context.Context, opts psOpts) error {
 		return errors.Wrap(err, "cannot connect to backend")
 	}
 
-	containers, err := c.ContainerService().List(ctx)
+	containers, err := c.ContainerService().List(ctx, opts.all)
 	if err != nil {
 		return errors.Wrap(err, "fetch containers")
 	}

containers/api.go

@@ -54,7 +54,9 @@ type LogsRequest struct {
 // Service interacts with the underlying container backend
 type Service interface {
 	// List returns all the containers
-	List(ctx context.Context) ([]Container, error)
+	List(ctx context.Context, all bool) ([]Container, error)
+	// Stop stops the running container
+	Stop(ctx context.Context, containerID string, timeout *uint32) error
 	// Run creates and starts a container
 	Run(ctx context.Context, config ContainerConfig) error
 	// Exec executes a command inside a running container