Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add reaper for compose #465

Closed
wants to merge 1 commit into from
Closed

feat: add reaper for compose #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 41 additions & 3 deletions compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
"github.com/google/uuid"
"gopkg.in/yaml.v3"

"github.com/testcontainers/testcontainers-go/wait"
Expand Down Expand Up @@ -54,6 +55,7 @@ type LocalDockerCompose struct {
Services map[string]interface{}
waitStrategySupplied bool
WaitStrategyMap map[waitService]wait.Strategy
reaper *Reaper
}

type (
Expand Down Expand Up @@ -83,7 +85,7 @@ func (f LocalDockerComposeOptionsFunc) ApplyToLocalCompose(opts *LocalDockerComp
// Docker Compose execution. The identifier represents the name of the execution,
// which will define the name of the underlying Docker network and the name of the
// running Compose services.
func NewLocalDockerCompose(filePaths []string, identifier string, opts ...LocalDockerComposeOption) *LocalDockerCompose {
func NewLocalDockerCompose(filePaths []string, identifier string, opts ...LocalDockerComposeOption) (*LocalDockerCompose, error) {
dc := &LocalDockerCompose{
LocalDockerComposeOptions: &LocalDockerComposeOptions{
Logger: Logger,
Expand Down Expand Up @@ -113,7 +115,27 @@ func NewLocalDockerCompose(filePaths []string, identifier string, opts ...LocalD
dc.waitStrategySupplied = false
dc.WaitStrategyMap = make(map[waitService]wait.Strategy)

return dc
reaperProvider, err := NewDockerProvider(WithLogger(dc.Logger))
if err != nil {
return nil, fmt.Errorf("%w: creating reaper provider failed", err)
}

sessionID := uuid.New()
dc.reaper, err = NewReaper(
context.Background(),
sessionID.String(),
reaperProvider,
withCustomLabels(
map[string]string{
"com.docker.compose.project": dc.Identifier,
},
),
)
if err != nil {
return nil, fmt.Errorf("%w: creating reaper failed", err)
}

return dc, nil
}

// Down executes docker-compose down
Expand Down Expand Up @@ -185,7 +207,13 @@ func (dc *LocalDockerCompose) applyStrategyToRunningContainer() error {

// Invoke invokes the docker compose
func (dc *LocalDockerCompose) Invoke() ExecError {
return executeCompose(dc, dc.Cmd)
execErr := executeCompose(dc, dc.Cmd)
err := dc.connectToReaper()
if err != nil && execErr.Error == nil {
execErr.Error = err
}

return execErr
}

// WaitForService sets the strategy for the service that is to be waited on
Expand Down Expand Up @@ -246,6 +274,16 @@ func (dc *LocalDockerCompose) validate() error {
return nil
}

func (dc *LocalDockerCompose) connectToReaper() error {
terminationSignal, err := dc.reaper.Connect()
if err != nil {
return fmt.Errorf("%w: connecting to reaper failed", err)
}

close(terminationSignal)
return nil
}

// ExecError is super struct that holds any information about an execution error, so the client code
// can handle the result
type ExecError struct {
Expand Down
Loading