tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1290 from docker/restart_logs

This commit is contained in:
Nicolas De loof 2021-02-12 17:54:38 +01:00 committed by GitHub
parent 4d05e0234a 4462f12249
commit 54a7819cbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aci/compose.go
View File

@ -207,6 +207,6 @@ func (cs *aciComposeService) Kill(ctx context.Context, project *types.Project, o
return errdefs.ErrNotImplemented
}
func (cs *aciComposeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
return errdefs.ErrNotImplemented
func (cs *aciComposeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
return 0, errdefs.ErrNotImplemented
}

4
api/client/compose.go
View File

@ -80,6 +80,6 @@ func (c *composeService) Kill(ctx context.Context, project *types.Project, optio
return errdefs.ErrNotImplemented
}
func (c *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
return errdefs.ErrNotImplemented
func (c *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
return 0, errdefs.ErrNotImplemented
}

2
api/compose/api.go
View File

@ -52,7 +52,7 @@ type Service interface {
// Kill executes the equivalent to a `compose kill`
Kill(ctx context.Context, project *types.Project, options KillOptions) error
// RunOneOffContainer creates a service oneoff container and starts its dependencies
RunOneOffContainer(ctx context.Context, project *types.Project, opts RunOptions) error
RunOneOffContainer(ctx context.Context, project *types.Project, opts RunOptions) (int, error)
}
// CreateOptions group options of the Create API

7
cli/cmd/compose/run.go
View File

@ -26,6 +26,7 @@ import (
"github.com/docker/compose-cli/api/client"
"github.com/docker/compose-cli/api/compose"
"github.com/docker/compose-cli/api/progress"
"github.com/docker/compose-cli/cli/cmd"
)
type runOptions struct {
@ -85,7 +86,11 @@ func runRun(ctx context.Context, opts runOptions) error {
Writer: os.Stdout,
Reader: os.Stdin,
}
return c.ComposeService().RunOneOffContainer(ctx, project, runOpts)
exitCode, err := c.ComposeService().RunOneOffContainer(ctx, project, runOpts)
if exitCode != 0 {
return cmd.ExitCodeError{ExitCode: exitCode}
}
return err
}
func startDependencies(ctx context.Context, c *client.Client, project types.Project, requestedServiceName string) error {

4
ecs/local/compose.go
View File

@ -172,6 +172,6 @@ func (e ecsLocalSimulation) Ps(ctx context.Context, projectName string, options
func (e ecsLocalSimulation) List(ctx context.Context) ([]compose.Stack, error) {
return e.compose.List(ctx)
}
func (e ecsLocalSimulation) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
return errors.Wrap(errdefs.ErrNotImplemented, "use docker-compose run")
func (e ecsLocalSimulation) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
return 0, errors.Wrap(errdefs.ErrNotImplemented, "use docker-compose run")
}

4
ecs/run.go
View File

@ -25,6 +25,6 @@ import (
"github.com/docker/compose-cli/api/errdefs"
)
func (b *ecsAPIService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
return errdefs.ErrNotImplemented
func (b *ecsAPIService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
return 0, errdefs.ErrNotImplemented
}

4
kube/compose.go
View File

@ -194,6 +194,6 @@ func (s *composeService) Kill(ctx context.Context, project *types.Project, optio
}
// RunOneOffContainer creates a service oneoff container and starts its dependencies
func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
return errdefs.ErrNotImplemented
func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
return 0, errdefs.ErrNotImplemented
}

2
local/compose/attach.go
View File

@ -114,7 +114,7 @@ func (s *composeService) getContainerStreams(ctx context.Context, container moby
Stdin: true,
Stdout: true,
Stderr: true,
Logs: true,
Logs: false,
})
if err != nil {
return nil, nil, err

1
local/compose/convergence.go
View File

@ -114,6 +114,7 @@ func (s *composeService) ensureService(ctx context.Context, observedState Contai
w.Event(progress.RunningEvent(name))
case status.ContainerCreated:
case status.ContainerRestarting:
case status.ContainerExited:
w.Event(progress.CreatedEvent(name))
default:
eg.Go(func() error {

48
local/compose/run.go
View File

@ -20,17 +20,16 @@ import (
"context"
"fmt"
"github.com/compose-spec/compose-go/types"
apitypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"golang.org/x/sync/errgroup"
"github.com/docker/compose-cli/api/compose"
"github.com/compose-spec/compose-go/types"
apitypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
moby "github.com/docker/docker/pkg/stringid"
)
func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) error {
func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.Project, opts compose.RunOptions) (int, error) {
originalServices := project.Services
var requestedService types.ServiceConfig
for _, service := range originalServices {
@ -53,23 +52,23 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
requestedService.Labels = requestedService.Labels.Add(oneoffLabel, "True")
if err := s.ensureImagesExists(ctx, project); err != nil { // all dependencies already checked, but might miss requestedService img
return err
return 0, err
}
if err := s.waitDependencies(ctx, project, requestedService); err != nil {
return err
return 0, err
}
if err := s.createContainer(ctx, project, requestedService, requestedService.ContainerName, 1, opts.AutoRemove); err != nil {
return err
return 0, err
}
containerID := requestedService.ContainerName
if opts.Detach {
err := s.apiClient.ContainerStart(ctx, containerID, apitypes.ContainerStartOptions{})
if err != nil {
return err
return 0, err
}
fmt.Fprintln(opts.Writer, containerID)
return nil
return 0, nil
}
containers, err := s.apiClient.ContainerList(ctx, apitypes.ContainerListOptions{
@ -79,16 +78,25 @@ func (s *composeService) RunOneOffContainer(ctx context.Context, project *types.
All: true,
})
if err != nil {
return err
return 0, err
}
oneoffContainer := containers[0]
eg := errgroup.Group{}
eg.Go(func() error {
return s.attachContainerStreams(ctx, oneoffContainer, true, opts.Reader, opts.Writer)
})
if err = s.apiClient.ContainerStart(ctx, containerID, apitypes.ContainerStartOptions{}); err != nil {
return err
err = s.attachContainerStreams(ctx, oneoffContainer, true, opts.Reader, opts.Writer)
if err != nil {
return 0, err
}
return eg.Wait()
err = s.apiClient.ContainerStart(ctx, containerID, apitypes.ContainerStartOptions{})
if err != nil {
return 0, err
}
statusC, errC := s.apiClient.ContainerWait(context.Background(), oneoffContainer.ID, container.WaitConditionNotRunning)
select {
case status := <-statusC:
return int(status.StatusCode), nil
case err := <-errC:
return 0, err
}
}