mirror of https://github.com/docker/compose.git
Add rm command
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
This commit is contained in:
parent
1a3365fa37
commit
40fa78ac5d
|
@ -98,11 +98,12 @@ func createACIContainers(ctx context.Context, aciContext store.AciContext, group
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func deleteACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) (c containerinstance.ContainerGroup, err error) {
|
func deleteACIContainerGroup(ctx context.Context, aciContext store.AciContext, containerGroupName string) (containerinstance.ContainerGroup, error) {
|
||||||
containerGroupsClient, err := getContainerGroupsClient(aciContext.SubscriptionID)
|
containerGroupsClient, err := getContainerGroupsClient(aciContext.SubscriptionID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return c, fmt.Errorf("cannot get container group client: %v", err)
|
return containerinstance.ContainerGroup{}, fmt.Errorf("cannot get container group client: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return containerGroupsClient.Delete(ctx, aciContext.ResourceGroup, containerGroupName)
|
return containerGroupsClient.Delete(ctx, aciContext.ResourceGroup, containerGroupName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -271,7 +272,7 @@ func getSubscriptionsClient() subscription.SubscriptionsClient {
|
||||||
return subc
|
return subc
|
||||||
}
|
}
|
||||||
|
|
||||||
//GetGroupsClient ...
|
// GetGroupsClient ...
|
||||||
func GetGroupsClient(subscriptionID string) resources.GroupsClient {
|
func GetGroupsClient(subscriptionID string) resources.GroupsClient {
|
||||||
groupsClient := resources.NewGroupsClient(subscriptionID)
|
groupsClient := resources.NewGroupsClient(subscriptionID)
|
||||||
authorizer, _ := auth.NewAuthorizerFromCLI()
|
authorizer, _ := auth.NewAuthorizerFromCLI()
|
||||||
|
@ -279,7 +280,7 @@ func GetGroupsClient(subscriptionID string) resources.GroupsClient {
|
||||||
return groupsClient
|
return groupsClient
|
||||||
}
|
}
|
||||||
|
|
||||||
//GetSubscriptionID ...
|
// GetSubscriptionID ...
|
||||||
func GetSubscriptionID(ctx context.Context) (string, error) {
|
func GetSubscriptionID(ctx context.Context) (string, error) {
|
||||||
c := getSubscriptionsClient()
|
c := getSubscriptionsClient()
|
||||||
res, err := c.List(ctx)
|
res, err := c.List(ctx)
|
||||||
|
|
|
@ -4,6 +4,7 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
@ -23,6 +24,9 @@ import (
|
||||||
|
|
||||||
const singleContainerName = "single--container--aci"
|
const singleContainerName = "single--container--aci"
|
||||||
|
|
||||||
|
// ErrNoSuchContainer is returned when the mentioned container does not exist
|
||||||
|
var ErrNoSuchContainer = errors.New("no such container")
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
backend.Register("aci", "aci", func(ctx context.Context) (backend.Service, error) {
|
backend.Register("aci", "aci", func(ctx context.Context) (backend.Service, error) {
|
||||||
return New(ctx)
|
return New(ctx)
|
||||||
|
@ -214,6 +218,18 @@ func (cs *aciContainerService) Logs(ctx context.Context, containerName string, r
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (cs *aciContainerService) Delete(ctx context.Context, containerID string, _ bool) error {
|
||||||
|
cg, err := deleteACIContainerGroup(ctx, cs.ctx, containerID)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if cg.StatusCode == http.StatusNoContent {
|
||||||
|
return ErrNoSuchContainer
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
type aciComposeService struct {
|
type aciComposeService struct {
|
||||||
containerGroupsClient containerinstance.ContainerGroupsClient
|
containerGroupsClient containerinstance.ContainerGroupsClient
|
||||||
ctx store.AciContext
|
ctx store.AciContext
|
||||||
|
@ -239,6 +255,14 @@ func (cs *aciComposeService) Down(ctx context.Context, opts compose.ProjectOptio
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
logrus.Debugf("Down on project with name %q\n", project.Name)
|
logrus.Debugf("Down on project with name %q\n", project.Name)
|
||||||
_, err = deleteACIContainerGroup(ctx, cs.ctx, project.Name)
|
|
||||||
|
cg, err := deleteACIContainerGroup(ctx, cs.ctx, project.Name)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if cg.StatusCode == http.StatusNoContent {
|
||||||
|
return ErrNoSuchContainer
|
||||||
|
}
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,51 @@
|
||||||
|
package cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
|
"github.com/docker/api/client"
|
||||||
|
)
|
||||||
|
|
||||||
|
type rmOpts struct {
|
||||||
|
force bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// RmCommand deletes containers
|
||||||
|
func RmCommand() *cobra.Command {
|
||||||
|
var opts rmOpts
|
||||||
|
cmd := &cobra.Command{
|
||||||
|
Use: "rm",
|
||||||
|
Aliases: []string{"delete"},
|
||||||
|
Short: "Remove containers",
|
||||||
|
Args: cobra.MinimumNArgs(1),
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
var errs []string
|
||||||
|
c, err := client.New(cmd.Context())
|
||||||
|
if err != nil {
|
||||||
|
return errors.Wrap(err, "cannot connect to backend")
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, id := range args {
|
||||||
|
err := c.ContainerService().Delete(cmd.Context(), id, opts.force)
|
||||||
|
if err != nil {
|
||||||
|
errs = append(errs, err.Error())
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
println(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(errs) > 0 {
|
||||||
|
return errors.New(strings.Join(errs, "\n"))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
cmd.Flags().BoolVarP(&opts.force, "force", "f", false, "Force removal")
|
||||||
|
|
||||||
|
return cmd
|
||||||
|
}
|
|
@ -108,6 +108,7 @@ func main() {
|
||||||
run.Command(),
|
run.Command(),
|
||||||
cmd.ExecCommand(),
|
cmd.ExecCommand(),
|
||||||
cmd.LogsCommand(),
|
cmd.LogsCommand(),
|
||||||
|
cmd.RmCommand(),
|
||||||
compose.Command(),
|
compose.Command(),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -54,4 +54,6 @@ type Service interface {
|
||||||
Exec(ctx context.Context, containerName string, command string, reader io.Reader, writer io.Writer) error
|
Exec(ctx context.Context, containerName string, command string, reader io.Reader, writer io.Writer) error
|
||||||
// Logs returns all the logs of a container
|
// Logs returns all the logs of a container
|
||||||
Logs(ctx context.Context, containerName string, request LogsRequest) error
|
Logs(ctx context.Context, containerName string, request LogsRequest) error
|
||||||
|
// Delete removes containers
|
||||||
|
Delete(ctx context.Context, id string, force bool) error
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,6 +59,11 @@ func (cs *containerService) Logs(ctx context.Context, containerName string, requ
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (cs *containerService) Delete(ctx context.Context, id string, force bool) error {
|
||||||
|
fmt.Printf("Deleting container %q with force = %t\n", id, force)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type composeService struct{}
|
type composeService struct{}
|
||||||
|
|
||||||
func (cs *composeService) Up(ctx context.Context, opts compose.ProjectOptions) error {
|
func (cs *composeService) Up(ctx context.Context, opts compose.ProjectOptions) error {
|
||||||
|
|
|
@ -72,8 +72,13 @@ func (p *proxyContainerAPI) Kill(_ context.Context, _ *v1.KillRequest) (*v1.Kill
|
||||||
panic("not implemented") // TODO: Implement
|
panic("not implemented") // TODO: Implement
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *proxyContainerAPI) Delete(_ context.Context, _ *v1.DeleteRequest) (*v1.DeleteResponse, error) {
|
func (p *proxyContainerAPI) Delete(ctx context.Context, request *v1.DeleteRequest) (*v1.DeleteResponse, error) {
|
||||||
panic("not implemented") // TODO: Implement
|
err := Client(ctx).ContainerService().Delete(ctx, request.Id, request.Force)
|
||||||
|
if err != nil {
|
||||||
|
return &v1.DeleteResponse{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &v1.DeleteResponse{}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *proxyContainerAPI) Update(_ context.Context, _ *v1.UpdateRequest) (*v1.UpdateResponse, error) {
|
func (p *proxyContainerAPI) Update(_ context.Context, _ *v1.UpdateRequest) (*v1.UpdateResponse, error) {
|
||||||
|
|
Loading…
Reference in New Issue