From 1a3182fb7f89431f619f5c05021a4060ac3aa00f Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Wed, 12 Aug 2020 10:35:15 +0200 Subject: [PATCH] Implement `docker start` for ACI --- aci/backend.go | 37 ++++++++++++++++++++---- cli/cmd/start.go | 71 ++++++++++++++++++++++++++++++++++++++++++++++ cli/main.go | 1 + containers/api.go | 2 ++ example/backend.go | 4 +++ local/backend.go | 4 +++ 6 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 cli/cmd/start.go diff --git a/aci/backend.go b/aci/backend.go index 67aedcc95..26bfd292d 100644 --- a/aci/backend.go +++ b/aci/backend.go @@ -24,6 +24,7 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/containerinstance/mgmt/2018-10-01/containerinstance" + "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/to" "github.com/compose-spec/compose-go/cli" "github.com/compose-spec/compose-go/types" @@ -224,6 +225,32 @@ func addTag(groupDefinition *containerinstance.ContainerGroup, tagName string) { groupDefinition.Tags[tagName] = to.StringPtr(tagName) } +func (cs *aciContainerService) Start(ctx context.Context, containerID string) error { + groupName, containerName := getGroupAndContainerName(containerID) + if groupName != containerID { + msg := "cannot delete service %q from compose application %q, you can delete the entire compose app with docker compose down --project-name %s" + return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) + } + + containerGroupsClient, err := getContainerGroupsClient(cs.ctx.SubscriptionID) + if err != nil { + return err + } + + future, err := containerGroupsClient.Start(ctx, cs.ctx.ResourceGroup, containerName) + if err != nil { + var aerr autorest.DetailedError + if ok := errors.As(err, &aerr); ok { + if aerr.StatusCode == http.StatusNotFound { + return errdefs.ErrNotFound + } + } + return err + } + + return future.WaitForCompletionRef(ctx, containerGroupsClient.Client) +} + func (cs *aciContainerService) Stop(ctx context.Context, containerID string, timeout *uint32) error { if timeout != nil && *timeout != uint32(0) { return errors.Errorf("ACI integration does not support setting a timeout to stop a container before killing it.") @@ -308,12 +335,12 @@ func (cs *aciContainerService) Delete(ctx context.Context, containerID string, r return errors.New(fmt.Sprintf(msg, containerName, groupName, groupName)) } - containerGroupsClient, err := getContainerGroupsClient(cs.ctx.SubscriptionID) - if err != nil { - return err - } - if !request.Force { + containerGroupsClient, err := getContainerGroupsClient(cs.ctx.SubscriptionID) + if err != nil { + return err + } + cg, err := containerGroupsClient.Get(ctx, cs.ctx.ResourceGroup, groupName) if err != nil { if cg.StatusCode == http.StatusNotFound { diff --git a/cli/cmd/start.go b/cli/cmd/start.go new file mode 100644 index 000000000..1f1e65650 --- /dev/null +++ b/cli/cmd/start.go @@ -0,0 +1,71 @@ +/* + Copyright 2020 Docker, Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +package cmd + +import ( + "context" + "fmt" + + "github.com/docker/api/errdefs" + + "github.com/pkg/errors" + "github.com/spf13/cobra" + + "github.com/hashicorp/go-multierror" + + "github.com/docker/api/client" +) + +// StartCommand deletes containers +func StartCommand() *cobra.Command { + cmd := &cobra.Command{ + Use: "start", + Short: "Start one or more stopped containers", + Args: cobra.MinimumNArgs(1), + RunE: func(cmd *cobra.Command, args []string) error { + return runStart(cmd.Context(), args) + }, + } + + return cmd +} + +func runStart(ctx context.Context, args []string) error { + c, err := client.New(ctx) + if err != nil { + return errors.Wrap(err, "cannot connect to backend") + } + + var errs *multierror.Error + for _, id := range args { + err := c.ContainerService().Start(ctx, id) + if err != nil { + if errdefs.IsNotFoundError(err) { + errs = multierror.Append(errs, fmt.Errorf("container %s not found", id)) + } else { + errs = multierror.Append(errs, err) + } + continue + } + fmt.Println(id) + } + if errs != nil { + errs.ErrorFormat = formatErrors + } + + return errs.ErrorOrNil() +} diff --git a/cli/main.go b/cli/main.go index 1216bff87..e7fc8a28a 100644 --- a/cli/main.go +++ b/cli/main.go @@ -119,6 +119,7 @@ func main() { cmd.ExecCommand(), cmd.LogsCommand(), cmd.RmCommand(), + cmd.StartCommand(), cmd.InspectCommand(), compose.Command(), login.Command(), diff --git a/containers/api.go b/containers/api.go index eeb01409c..b1eb0c8ac 100644 --- a/containers/api.go +++ b/containers/api.go @@ -114,6 +114,8 @@ type DeleteRequest struct { type Service interface { // List returns all the containers List(ctx context.Context, all bool) ([]Container, error) + // Start starts a stopped container + Start(ctx context.Context, containerID string) error // Stop stops the running container Stop(ctx context.Context, containerID string, timeout *uint32) error // Run creates and starts a container diff --git a/example/backend.go b/example/backend.go index 0102d76c6..9cb54004e 100644 --- a/example/backend.go +++ b/example/backend.go @@ -92,6 +92,10 @@ func (cs *containerService) Run(ctx context.Context, r containers.ContainerConfi return nil } +func (cs *containerService) Start(ctx context.Context, containerID string) error { + return errors.New("not implemented") +} + func (cs *containerService) Stop(ctx context.Context, containerName string, timeout *uint32) error { return errors.New("not implemented") } diff --git a/local/backend.go b/local/backend.go index 0a807d133..5973062db 100644 --- a/local/backend.go +++ b/local/backend.go @@ -170,6 +170,10 @@ func (ms *local) Run(ctx context.Context, r containers.ContainerConfig) error { return ms.apiClient.ContainerStart(ctx, created.ID, types.ContainerStartOptions{}) } +func (ms *local) Start(ctx context.Context, containerID string) error { + return ms.apiClient.ContainerStart(ctx, containerID, types.ContainerStartOptions{}) +} + func (ms *local) Stop(ctx context.Context, containerID string, timeout *uint32) error { var t *time.Duration if timeout != nil {