mirror of https://github.com/docker/compose.git
Fixing linter after rebasing
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
parent
ecdc170938
commit
6a03c4ff03
|
@ -25,6 +25,7 @@ import (
|
|||
"k8s.io/client-go/tools/clientcmd"
|
||||
)
|
||||
|
||||
// ListAvailableKubeConfigContexts list kube contexts
|
||||
func ListAvailableKubeConfigContexts(kubeconfig string) ([]string, error) {
|
||||
config, err := clientcmd.NewDefaultPathOptions().GetStartingConfig()
|
||||
if err != nil {
|
||||
|
|
|
@ -85,6 +85,11 @@ func (s *composeService) Start(ctx context.Context, project *types.Project, cons
|
|||
return errdefs.ErrNotImplemented
|
||||
}
|
||||
|
||||
// Stop executes the equivalent to a `compose stop`
|
||||
func (s *composeService) Stop(ctx context.Context, project *types.Project, consumer compose.LogConsumer) error {
|
||||
return errdefs.ErrNotImplemented
|
||||
}
|
||||
|
||||
// Logs executes the equivalent to a `compose logs`
|
||||
func (s *composeService) Logs(ctx context.Context, projectName string, consumer compose.LogConsumer, options compose.LogOptions) error {
|
||||
return errdefs.ErrNotImplemented
|
||||
|
|
|
@ -35,6 +35,7 @@ type ContextParams struct {
|
|||
FromEnvironment bool
|
||||
}
|
||||
|
||||
// CreateContextData create Docker context data
|
||||
func (cp ContextParams) CreateContextData() (interface{}, string, error) {
|
||||
if cp.FromEnvironment {
|
||||
// we use the current kubectl context from a $KUBECONFIG path
|
||||
|
|
|
@ -113,7 +113,12 @@ func (s *composeService) removeContainers(ctx context.Context, w progress.Writer
|
|||
toDelete := container
|
||||
eg.Go(func() error {
|
||||
eventName := "Container " + getCanonicalContainerName(toDelete)
|
||||
w.Event(progress.StoppingEvent(eventName))
|
||||
err := s.stopContainers(ctx, w, []moby.Container{container})
|
||||
if err != nil {
|
||||
w.Event(progress.ErrorMessageEvent(eventName, "Error while Removing"))
|
||||
return err
|
||||
}
|
||||
w.Event(progress.RemovingEvent(eventName))
|
||||
err = s.apiClient.ContainerRemove(ctx, toDelete.ID, moby.ContainerRemoveOptions{Force: true})
|
||||
if err != nil {
|
||||
|
|
|
@ -48,6 +48,9 @@ func (s *composeService) Stop(ctx context.Context, project *types.Project, consu
|
|||
containers = others
|
||||
return err
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return eg.Wait()
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue