From dd25b63cfd86bd7dad5d30e988e58a9893005bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 16 Apr 2024 12:36:20 +0200
Subject: [PATCH 01/17] feat: add testcontainers labels to compose containers
---
modules/compose/compose_api.go | 5 ++++
modules/compose/compose_api_test.go | 39 +++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index 409875537c..491b4586e2 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -353,6 +353,11 @@ func (d *dockerCompose) compileProject(ctx context.Context) (*types.Project, err
api.ConfigFilesLabel: strings.Join(proj.ComposeFiles, ","),
api.OneoffLabel: "False", // default, will be overridden by `run` command
}
+
+ for k, label := range testcontainers.GenericLabels() {
+ s.CustomLabels[k] = label
+ }
+
for i, envFile := range compiledOptions.EnvFiles {
// add a label for each env file, indexed by its position
s.CustomLabels[fmt.Sprintf("%s.%d", api.EnvironmentFileLabel, i)] = envFile
diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
index b639b87eab..cb1a433461 100644
--- a/modules/compose/compose_api_test.go
+++ b/modules/compose/compose_api_test.go
@@ -118,6 +118,45 @@ func TestDockerComposeAPIWithRunServices(t *testing.T) {
assert.Contains(t, serviceNames, "nginx")
}
+func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
+ path := filepath.Join(testdataPackage, complexCompose)
+ compose, err := NewDockerCompose(path)
+ require.NoError(t, err, "NewDockerCompose()")
+
+ t.Cleanup(func() {
+ require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
+ })
+
+ ctx, cancel := context.WithCancel(context.Background())
+ t.Cleanup(cancel)
+
+ err = compose.
+ WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ Up(ctx, Wait(true))
+
+ require.NoError(t, err, "compose.Up()")
+
+ serviceNames := compose.Services()
+
+ assert.Len(t, serviceNames, 2)
+ assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "mysql")
+
+ // all the services in the compose has the Testcontainers Labels
+ for _, serviceName := range serviceNames {
+ c, err := compose.ServiceContainer(context.Background(), serviceName)
+ require.NoError(t, err, "compose.ServiceContainer()")
+
+ inspect, err := compose.dockerClient.ContainerInspect(ctx, c.GetContainerID())
+ require.NoError(t, err, "dockerClient.ContainerInspect()")
+
+ for key, label := range testcontainers.GenericLabels() {
+ assert.Contains(t, inspect.Config.Labels, key, "Label %s is not present in container %s", key, c.GetContainerID())
+ assert.Equal(t, label, inspect.Config.Labels[key], "Label %s value is not correct in container %s", key, c.GetContainerID())
+ }
+ }
+}
+
func TestDockerComposeAPIWithStopServices(t *testing.T) {
path := filepath.Join(testdataPackage, complexCompose)
compose, err := NewDockerComposeWith(
From c6546ff78db18866713f9d666e70a15d75cce7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 16 Apr 2024 16:18:43 +0200
Subject: [PATCH 02/17] feat: support reaper for compose
---
modules/compose/compose.go | 47 ++++++++++++++++++----
modules/compose/compose_api.go | 12 ++++++
modules/compose/compose_api_test.go | 61 +++++++++++++++++++++++++++++
reaper.go | 3 +-
4 files changed, 115 insertions(+), 8 deletions(-)
diff --git a/modules/compose/compose.go b/modules/compose/compose.go
index 242caef501..a010f7a264 100644
--- a/modules/compose/compose.go
+++ b/modules/compose/compose.go
@@ -3,6 +3,7 @@ package compose
import (
"context"
"errors"
+ "fmt"
"path/filepath"
"runtime"
"strings"
@@ -121,14 +122,46 @@ func NewDockerComposeWith(opts ...ComposeStackOption) (*dockerCompose, error) {
return nil, err
}
+ reaperProvider, err := testcontainers.NewDockerProvider()
+ if err != nil {
+ return nil, fmt.Errorf("failed to create reaper provider for compose: %w", err)
+ }
+
+ tcConfig := reaperProvider.Config()
+
+ ctx := context.Background()
+
+ var termSignal chan bool
+ if !tcConfig.RyukDisabled {
+ // NewReaper is deprecated: we need to find a way to create the reaper for compose
+ // bypassing the deprecation.
+ r, err := testcontainers.NewReaper(ctx, testcontainers.SessionID(), reaperProvider, "")
+ if err != nil {
+ return nil, fmt.Errorf("failed to create reaper for compose: %w", err)
+ }
+
+ termSignal, err = r.Connect()
+ if err != nil {
+ return nil, fmt.Errorf("failed to connect to reaper: %w", err)
+ }
+ }
+ // Cleanup on error, otherwise set termSignal to nil before successful return.
+ defer func() {
+ if termSignal != nil {
+ termSignal <- true
+ }
+ }()
+
composeAPI := &dockerCompose{
- name: composeOptions.Identifier,
- configs: composeOptions.Paths,
- logger: composeOptions.Logger,
- composeService: compose.NewComposeService(dockerCli),
- dockerClient: dockerCli.Client(),
- waitStrategies: make(map[string]wait.Strategy),
- containers: make(map[string]*testcontainers.DockerContainer),
+ name: composeOptions.Identifier,
+ configs: composeOptions.Paths,
+ logger: composeOptions.Logger,
+ composeService: compose.NewComposeService(dockerCli),
+ dockerClient: dockerCli.Client(),
+ waitStrategies: make(map[string]wait.Strategy),
+ containers: make(map[string]*testcontainers.DockerContainer),
+ sessionID: testcontainers.SessionID(),
+ terminationSignal: termSignal,
}
return composeAPI, nil
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index 491b4586e2..2f636fdead 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -147,6 +147,12 @@ type dockerCompose struct {
// compiled compose project
// can be nil if the stack wasn't started yet
project *types.Project
+
+ // sessionID is used to identify the reaper session
+ sessionID string
+
+ // terminationSignal is used to signal the reaper to stop
+ terminationSignal chan bool
}
func (d *dockerCompose) ServiceContainer(ctx context.Context, svcName string) (*testcontainers.DockerContainer, error) {
@@ -167,6 +173,12 @@ func (d *dockerCompose) Down(ctx context.Context, opts ...StackDownOption) error
d.lock.Lock()
defer d.lock.Unlock()
+ select {
+ // close reaper if it was created
+ case d.terminationSignal <- true:
+ default:
+ }
+
options := stackDownOptions{
DownOptions: api.DownOptions{
Project: d.project,
diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
index cb1a433461..6adeb8f54c 100644
--- a/modules/compose/compose_api_test.go
+++ b/modules/compose/compose_api_test.go
@@ -15,6 +15,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/testcontainers/testcontainers-go"
+ "github.com/testcontainers/testcontainers-go/internal/config"
"github.com/testcontainers/testcontainers-go/wait"
)
@@ -157,6 +158,66 @@ func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
}
}
+func TestDockerComposeAPI_WithReaper(t *testing.T) {
+ config.Reset() // reset the config using the internal method to avoid the sync.Once
+ tcConfig := config.Read()
+ if tcConfig.RyukDisabled {
+ t.Skip("Ryuk is disabled, skipping test")
+ }
+
+ path := filepath.Join(testdataPackage, complexCompose)
+ compose, err := NewDockerCompose(path)
+ require.NoError(t, err, "NewDockerCompose()")
+
+ // reaper is enabled, so we don't need to manually stop the containers: Ryuk will do it for us
+
+ ctx, cancel := context.WithCancel(context.Background())
+ t.Cleanup(cancel)
+
+ err = compose.
+ WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ Up(ctx, Wait(true))
+
+ require.NoError(t, err, "compose.Up()")
+
+ serviceNames := compose.Services()
+
+ assert.Len(t, serviceNames, 2)
+ assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "mysql")
+}
+
+func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
+ config.Reset() // reset the config using the internal method to avoid the sync.Once
+ tcConfig := config.Read()
+ if !tcConfig.RyukDisabled {
+ t.Skip("Ryuk is enabled, skipping test")
+ }
+
+ path := filepath.Join(testdataPackage, complexCompose)
+ compose, err := NewDockerCompose(path)
+ require.NoError(t, err, "NewDockerCompose()")
+ t.Cleanup(func() {
+ // because reaper is disabled, we need to manually stop the containers
+ require.NoError(t, compose.Down(context.Background(), RemoveOrphans(true), RemoveImagesLocal), "compose.Down()")
+ })
+
+ ctx, cancel := context.WithCancel(context.Background())
+ t.Cleanup(cancel)
+
+ err = compose.
+ WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ Up(ctx, Wait(true))
+
+ require.NoError(t, err, "compose.Up()")
+
+ serviceNames := compose.Services()
+
+ assert.Len(t, serviceNames, 2)
+ assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "mysql")
+}
+
func TestDockerComposeAPIWithStopServices(t *testing.T) {
path := filepath.Join(testdataPackage, complexCompose)
compose, err := NewDockerComposeWith(
diff --git a/reaper.go b/reaper.go
index 859f8b76de..54feb90cbe 100644
--- a/reaper.go
+++ b/reaper.go
@@ -46,7 +46,8 @@ type ReaperProvider interface {
}
// NewReaper creates a Reaper with a sessionID to identify containers and a provider to use
-// Deprecated: it's not possible to create a reaper anymore.
+// Deprecated: it's not possible to create a reaper anymore. Compose module uses this method
+// to create a reaper for the compose stack.
func NewReaper(ctx context.Context, sessionID string, provider ReaperProvider, reaperImageName string) (*Reaper, error) {
return reuseOrCreateReaper(ctx, sessionID, provider)
}
From 58971626f2cb050f4c7f658a3575462716417bcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 18 Apr 2024 17:48:06 +0200
Subject: [PATCH 03/17] chore: increase ryuk reconnection timeout on CI
---
.github/workflows/ci-test-go.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
index a56dab64a4..6a11ea5e39 100644
--- a/.github/workflows/ci-test-go.yml
+++ b/.github/workflows/ci-test-go.yml
@@ -50,6 +50,7 @@ jobs:
continue-on-error: ${{ !inputs.fail-fast }}
env:
TESTCONTAINERS_RYUK_DISABLED: "${{ inputs.ryuk-disabled }}"
+ RYUK_RECONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '30s' || '10s' }}"
steps:
- name: Setup rootless Docker
if: ${{ inputs.rootless-docker }}
From f29d297c1615098a4fc83dbd75078c8adcf3a7e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 18 Apr 2024 18:15:09 +0200
Subject: [PATCH 04/17] chore: cache containers on UP
---
modules/compose/compose_api.go | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index 2f636fdead..c91f6dc298 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -262,6 +262,10 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
if err != nil {
return err
}
+
+ // cache all the containers on compose.up
+ d.containers[svc] = target
+
return strategy.WaitUntilReady(errGrpCtx, target)
})
}
From 3d50c38484fefdb1ca4c4448cad355962ea4adcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Thu, 18 Apr 2024 18:45:26 +0200
Subject: [PATCH 05/17] chore: more tuning for compose
---
.github/workflows/ci-test-go.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
index 6a11ea5e39..36f1e6de4f 100644
--- a/.github/workflows/ci-test-go.yml
+++ b/.github/workflows/ci-test-go.yml
@@ -50,6 +50,7 @@ jobs:
continue-on-error: ${{ !inputs.fail-fast }}
env:
TESTCONTAINERS_RYUK_DISABLED: "${{ inputs.ryuk-disabled }}"
+ RYUK_CONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '5m' || '60s' }}"
RYUK_RECONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '30s' || '10s' }}"
steps:
- name: Setup rootless Docker
From a2bc318bf240011fd389ea4e0b7930a374da5a3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 13:13:48 +0200
Subject: [PATCH 06/17] chore: more consistent assertion
---
modules/compose/compose_api_test.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
index 6adeb8f54c..e14c3185b7 100644
--- a/modules/compose/compose_api_test.go
+++ b/modules/compose/compose_api_test.go
@@ -252,7 +252,7 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {
state, err := mysqlContainer.State(ctx)
require.NoError(t, err)
assert.False(t, state.Running)
- assert.Equal(t, "exited", state.Status)
+ assert.Contains(t, []string{"exited", "removing"}, state.Status)
}
func TestDockerComposeAPIWithWaitForService(t *testing.T) {
From 86eb7fda80126d96961d64b6bd64117fd176e4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 13:39:32 +0200
Subject: [PATCH 07/17] chore: the compose stack asks for the reaper, but each
container then connects to it
---
docker.go | 5 ++++
modules/compose/compose.go | 35 ++++++++--------------
modules/compose/compose_api.go | 54 ++++++++++++++++++++++++++++------
3 files changed, 62 insertions(+), 32 deletions(-)
diff --git a/docker.go b/docker.go
index 79f85b8f00..6b8fe42002 100644
--- a/docker.go
+++ b/docker.go
@@ -98,6 +98,11 @@ func (c *DockerContainer) SetProvider(provider *DockerProvider) {
c.provider = provider
}
+// SetTerminationSignal sets the termination signal for the container
+func (c *DockerContainer) SetTerminationSignal(signal chan bool) {
+ c.terminationSignal = signal
+}
+
func (c *DockerContainer) GetContainerID() string {
return c.ID
}
diff --git a/modules/compose/compose.go b/modules/compose/compose.go
index a010f7a264..82023b86f9 100644
--- a/modules/compose/compose.go
+++ b/modules/compose/compose.go
@@ -129,39 +129,28 @@ func NewDockerComposeWith(opts ...ComposeStackOption) (*dockerCompose, error) {
tcConfig := reaperProvider.Config()
- ctx := context.Background()
-
- var termSignal chan bool
+ var composeReaper *testcontainers.Reaper
if !tcConfig.RyukDisabled {
// NewReaper is deprecated: we need to find a way to create the reaper for compose
// bypassing the deprecation.
- r, err := testcontainers.NewReaper(ctx, testcontainers.SessionID(), reaperProvider, "")
+ r, err := testcontainers.NewReaper(context.Background(), testcontainers.SessionID(), reaperProvider, "")
if err != nil {
return nil, fmt.Errorf("failed to create reaper for compose: %w", err)
}
- termSignal, err = r.Connect()
- if err != nil {
- return nil, fmt.Errorf("failed to connect to reaper: %w", err)
- }
+ composeReaper = r
}
- // Cleanup on error, otherwise set termSignal to nil before successful return.
- defer func() {
- if termSignal != nil {
- termSignal <- true
- }
- }()
composeAPI := &dockerCompose{
- name: composeOptions.Identifier,
- configs: composeOptions.Paths,
- logger: composeOptions.Logger,
- composeService: compose.NewComposeService(dockerCli),
- dockerClient: dockerCli.Client(),
- waitStrategies: make(map[string]wait.Strategy),
- containers: make(map[string]*testcontainers.DockerContainer),
- sessionID: testcontainers.SessionID(),
- terminationSignal: termSignal,
+ name: composeOptions.Identifier,
+ configs: composeOptions.Paths,
+ logger: composeOptions.Logger,
+ composeService: compose.NewComposeService(dockerCli),
+ dockerClient: dockerCli.Client(),
+ waitStrategies: make(map[string]wait.Strategy),
+ containers: make(map[string]*testcontainers.DockerContainer),
+ sessionID: testcontainers.SessionID(),
+ reaper: composeReaper,
}
return composeAPI, nil
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index c91f6dc298..cb992e072b 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -151,8 +151,8 @@ type dockerCompose struct {
// sessionID is used to identify the reaper session
sessionID string
- // terminationSignal is used to signal the reaper to stop
- terminationSignal chan bool
+ // reaper is used to clean up containers after the stack is stopped
+ reaper *testcontainers.Reaper
}
func (d *dockerCompose) ServiceContainer(ctx context.Context, svcName string) (*testcontainers.DockerContainer, error) {
@@ -173,12 +173,6 @@ func (d *dockerCompose) Down(ctx context.Context, opts ...StackDownOption) error
d.lock.Lock()
defer d.lock.Unlock()
- select {
- // close reaper if it was created
- case d.terminationSignal <- true:
- default:
- }
-
options := stackDownOptions{
DownOptions: api.DownOptions{
Project: d.project,
@@ -247,11 +241,53 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
return err
}
+ errGrp, errGrpCtx := errgroup.WithContext(ctx)
+
+ for _, srv := range d.project.Services {
+ // we are going to connect each container to the reaper
+ srv := srv
+ errGrp.Go(func() error {
+ var dc *testcontainers.DockerContainer
+ if d.containers[srv.Name] != nil {
+ dc = d.containers[srv.Name]
+ } else {
+ var err error
+ dc, err = d.lookupContainer(errGrpCtx, srv.Name)
+ if err != nil {
+ return err
+ }
+ }
+
+ if d.reaper != nil {
+ termSignal, err := d.reaper.Connect()
+ if err != nil {
+ return fmt.Errorf("failed to connect to reaper: %w", err)
+ }
+ dc.SetTerminationSignal(termSignal)
+
+ // Cleanup on error, otherwise set termSignal to nil before successful return.
+ defer func() {
+ if termSignal != nil {
+ termSignal <- true
+ }
+ }()
+ }
+
+ d.containers[srv.Name] = dc
+
+ return nil
+ })
+ }
+
+ if err := errGrp.Wait(); err != nil {
+ return err
+ }
+
if len(d.waitStrategies) == 0 {
return nil
}
- errGrp, errGrpCtx := errgroup.WithContext(ctx)
+ errGrp, errGrpCtx = errgroup.WithContext(errGrpCtx)
for svc, strategy := range d.waitStrategies { // pinning the variables
svc := svc
From 79bef4b9fcdfe44343d9904675c3e0a4ba9a7265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 15:54:01 +0200
Subject: [PATCH 08/17] chore: use different error groups
the first time wait is called, the context is cancelled
---
modules/compose/compose_api.go | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index cb992e072b..a6d36e2655 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -241,12 +241,12 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
return err
}
- errGrp, errGrpCtx := errgroup.WithContext(ctx)
+ errGrpContainers, errGrpCtx := errgroup.WithContext(ctx)
for _, srv := range d.project.Services {
// we are going to connect each container to the reaper
srv := srv
- errGrp.Go(func() error {
+ errGrpContainers.Go(func() error {
var dc *testcontainers.DockerContainer
if d.containers[srv.Name] != nil {
dc = d.containers[srv.Name]
@@ -279,7 +279,8 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
})
}
- if err := errGrp.Wait(); err != nil {
+ // wait here for the containers lookup to finish
+ if err := errGrpContainers.Wait(); err != nil {
return err
}
@@ -287,13 +288,13 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
return nil
}
- errGrp, errGrpCtx = errgroup.WithContext(errGrpCtx)
+ errGrpWait, errGrpCtx := errgroup.WithContext(ctx)
for svc, strategy := range d.waitStrategies { // pinning the variables
svc := svc
strategy := strategy
- errGrp.Go(func() error {
+ errGrpWait.Go(func() error {
target, err := d.lookupContainer(errGrpCtx, svc)
if err != nil {
return err
@@ -306,7 +307,7 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
})
}
- return errGrp.Wait()
+ return errGrpWait.Wait()
}
func (d *dockerCompose) WaitForService(s string, strategy wait.Strategy) ComposeStack {
From df587aa790de9a97a5bd1c566f00c2cc56c0f45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 15:55:03 +0200
Subject: [PATCH 09/17] chore: the lookup method include cache checks
---
modules/compose/compose_api.go | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index a6d36e2655..5496a1ef1b 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -247,15 +247,9 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
// we are going to connect each container to the reaper
srv := srv
errGrpContainers.Go(func() error {
- var dc *testcontainers.DockerContainer
- if d.containers[srv.Name] != nil {
- dc = d.containers[srv.Name]
- } else {
- var err error
- dc, err = d.lookupContainer(errGrpCtx, srv.Name)
- if err != nil {
- return err
- }
+ dc, err := d.lookupContainer(errGrpCtx, srv.Name)
+ if err != nil {
+ return err
}
if d.reaper != nil {
From c0d1cf9f13862597f80d883dab563d7df1f998d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 17:14:13 +0200
Subject: [PATCH 10/17] chore: update tests to make them deterministic
---
modules/compose/compose_api_test.go | 49 ++++----
modules/compose/compose_builder_test.go | 109 ++++++++++++++++++
modules/compose/compose_test.go | 37 +++---
.../compose/testdata/docker-compose-build.yml | 2 +-
.../testdata/docker-compose-complex.yml | 4 +-
.../docker-compose-container-name.yml | 2 +-
.../testdata/docker-compose-override.yml | 2 +-
.../testdata/docker-compose-postgres.yml | 2 +-
.../testdata/docker-compose-simple.yml | 2 +-
.../testdata/docker-compose-volume.yml | 2 +-
10 files changed, 154 insertions(+), 57 deletions(-)
create mode 100644 modules/compose/compose_builder_test.go
diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
index e14c3185b7..ffbf28026e 100644
--- a/modules/compose/compose_api_test.go
+++ b/modules/compose/compose_api_test.go
@@ -19,15 +19,8 @@ import (
"github.com/testcontainers/testcontainers-go/wait"
)
-const (
- simpleCompose = "docker-compose-simple.yml"
- complexCompose = "docker-compose-complex.yml"
- composeWithVolume = "docker-compose-volume.yml"
- testdataPackage = "testdata"
-)
-
func TestDockerComposeAPI(t *testing.T) {
- path := filepath.Join(testdataPackage, simpleCompose)
+ path := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -42,7 +35,7 @@ func TestDockerComposeAPI(t *testing.T) {
}
func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
- path := filepath.Join(testdataPackage, simpleCompose)
+ path := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -68,7 +61,7 @@ func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
}
func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -93,7 +86,7 @@ func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
}
func TestDockerComposeAPIWithRunServices(t *testing.T) {
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -120,7 +113,7 @@ func TestDockerComposeAPIWithRunServices(t *testing.T) {
}
func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -165,7 +158,7 @@ func TestDockerComposeAPI_WithReaper(t *testing.T) {
t.Skip("Ryuk is disabled, skipping test")
}
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -194,7 +187,7 @@ func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
t.Skip("Ryuk is enabled, skipping test")
}
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
t.Cleanup(func() {
@@ -219,7 +212,7 @@ func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
}
func TestDockerComposeAPIWithStopServices(t *testing.T) {
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerComposeWith(
WithStackFiles(path),
WithLogger(testcontainers.TestLogger(t)))
@@ -256,7 +249,7 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {
}
func TestDockerComposeAPIWithWaitForService(t *testing.T) {
- path := filepath.Join(testdataPackage, simpleCompose)
+ path := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -283,7 +276,7 @@ func TestDockerComposeAPIWithWaitForService(t *testing.T) {
}
func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
- path := filepath.Join(testdataPackage, simpleCompose)
+ path := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -310,7 +303,7 @@ func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
}
func TestDockerComposeAPIWithContainerName(t *testing.T) {
- path := filepath.Join(testdataPackage, "docker-compose-container-name.yml")
+ path := RenderComposeWithName(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -361,7 +354,7 @@ func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {
}
func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -387,7 +380,7 @@ func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
}
func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
- path := filepath.Join(testdataPackage, simpleCompose)
+ path := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -416,7 +409,7 @@ func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
}
func TestDockerComposeAPIComplex(t *testing.T) {
- path := filepath.Join(testdataPackage, complexCompose)
+ path := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -439,7 +432,7 @@ func TestDockerComposeAPIComplex(t *testing.T) {
func TestDockerComposeAPIWithEnvironment(t *testing.T) {
identifier := testNameHash(t.Name())
- path := filepath.Join(testdataPackage, simpleCompose)
+ path := RenderComposeSimple(t)
compose, err := NewDockerComposeWith(WithStackFiles(path), identifier)
require.NoError(t, err, "NewDockerCompose()")
@@ -472,9 +465,9 @@ func TestDockerComposeAPIWithEnvironment(t *testing.T) {
func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
composeFiles := ComposeStackFiles{
- filepath.Join(testdataPackage, simpleCompose),
- filepath.Join(testdataPackage, "docker-compose-postgres.yml"),
- filepath.Join(testdataPackage, "docker-compose-override.yml"),
+ RenderComposeSimple(t),
+ RenderComposePostgres(t),
+ RenderComposeOverride(t),
}
identifier := testNameHash(t.Name())
@@ -513,7 +506,7 @@ func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
}
func TestDockerComposeAPIWithVolume(t *testing.T) {
- path := filepath.Join(testdataPackage, composeWithVolume)
+ path := RenderComposeWithVolume(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -529,7 +522,7 @@ func TestDockerComposeAPIWithVolume(t *testing.T) {
}
func TestDockerComposeAPIVolumesDeletedOnDown(t *testing.T) {
- path := filepath.Join(testdataPackage, composeWithVolume)
+ path := RenderComposeWithVolume(t)
identifier := uuid.New().String()
stackFiles := WithStackFiles(path)
compose, err := NewDockerComposeWith(stackFiles, StackIdentifier(identifier))
@@ -556,7 +549,7 @@ func TestDockerComposeAPIVolumesDeletedOnDown(t *testing.T) {
func TestDockerComposeAPIWithBuild(t *testing.T) {
t.Skip("Skipping test because of the opentelemetry dependencies issue. See https://github.com/open-telemetry/opentelemetry-go/issues/4476#issuecomment-1840547010")
- path := filepath.Join(testdataPackage, "docker-compose-build.yml")
+ path := RenderComposeWithBuild(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
diff --git a/modules/compose/compose_builder_test.go b/modules/compose/compose_builder_test.go
new file mode 100644
index 0000000000..1cc4cb1431
--- /dev/null
+++ b/modules/compose/compose_builder_test.go
@@ -0,0 +1,109 @@
+package compose
+
+import (
+ "fmt"
+ "html/template"
+ "io"
+ "net"
+ "os"
+ "path/filepath"
+ "testing"
+)
+
+const (
+ testdataPackage = "testdata"
+)
+
+func RenderComposeComplex(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-complex.yml", getFreePort(t), getFreePort(t))
+}
+
+func RenderComposeOverride(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-override.yml", getFreePort(t))
+}
+
+func RenderComposePostgres(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-postgres.yml", getFreePort(t))
+}
+
+func RenderComposeSimple(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-simple.yml", getFreePort(t))
+}
+
+func RenderComposeWithBuild(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-build.yml", getFreePort(t))
+}
+
+func RenderComposeWithName(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-container-name.yml", getFreePort(t))
+}
+
+func RenderComposeWithVolume(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-volume.yml", getFreePort(t))
+}
+
+// getFreePort asks the kernel for a free open port that is ready to use.
+func getFreePort(t *testing.T) int {
+ t.Helper()
+
+ addr, err := net.ResolveTCPAddr("tcp", "localhost:0")
+ if err != nil {
+ t.Fatalf("failed to resolve TCP address: %v", err)
+ }
+
+ l, err := net.ListenTCP("tcp", addr)
+ if err != nil {
+ t.Fatalf("failed to listen on TCP address: %v", err)
+ }
+ defer l.Close()
+
+ return l.Addr().(*net.TCPAddr).Port
+}
+
+func writeTemplate(t *testing.T, templateFile string, port ...int) string {
+ t.Helper()
+
+ tmpDir := t.TempDir()
+ composeFile := filepath.Join(tmpDir, "docker-compose.yml")
+
+ tmpl, err := template.ParseFiles(filepath.Join(testdataPackage, templateFile))
+ if err != nil {
+ t.Fatalf("parsing template file: %s", err)
+ }
+
+ values := map[string]interface{}{}
+ for i, p := range port {
+ values[fmt.Sprintf("Port_%d", i)] = p
+ }
+
+ output, err := os.Create(composeFile)
+ if err != nil {
+ t.Fatalf("creating output file: %s", err)
+ }
+ defer output.Close()
+
+ executeTemplateFile := func(templateFile *template.Template, wr io.Writer, data any) error {
+ return templateFile.Execute(wr, data)
+ }
+
+ err = executeTemplateFile(tmpl, output, values)
+ if err != nil {
+ t.Fatalf("executing template file: %s", err)
+ }
+
+ return composeFile
+}
diff --git a/modules/compose/compose_test.go b/modules/compose/compose_test.go
index c87e204725..20be7acde4 100644
--- a/modules/compose/compose_test.go
+++ b/modules/compose/compose_test.go
@@ -20,11 +20,6 @@ import (
"github.com/testcontainers/testcontainers-go/wait"
)
-var (
- complexComposeTestFile string = filepath.Join("testdata", "docker-compose-complex.yml")
- simpleComposeTestFile string = filepath.Join("testdata", "docker-compose-simple.yml")
-)
-
func ExampleNewLocalDockerCompose() {
path := "/path/to/docker-compose.yml"
@@ -103,7 +98,7 @@ func ExampleLocalDockerCompose_WithEnv() {
}
func TestLocalDockerCompose(t *testing.T) {
- path := simpleComposeTestFile
+ path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -121,7 +116,7 @@ func TestLocalDockerCompose(t *testing.T) {
}
func TestDockerComposeStrategyForInvalidService(t *testing.T) {
- path := simpleComposeTestFile
+ path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -144,7 +139,7 @@ func TestDockerComposeStrategyForInvalidService(t *testing.T) {
}
func TestDockerComposeWithWaitLogStrategy(t *testing.T) {
- path := complexComposeTestFile
+ path := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -168,7 +163,7 @@ func TestDockerComposeWithWaitLogStrategy(t *testing.T) {
}
func TestDockerComposeWithWaitForService(t *testing.T) {
- path := simpleComposeTestFile
+ path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -193,7 +188,7 @@ func TestDockerComposeWithWaitForService(t *testing.T) {
}
func TestDockerComposeWithWaitForShortLifespanService(t *testing.T) {
- path := filepath.Join("testdata", "docker-compose-short-lifespan.yml")
+ path := filepath.Join(testdataPackage, "docker-compose-short-lifespan.yml")
identifier := strings.ToLower(uuid.New().String())
@@ -218,7 +213,7 @@ func TestDockerComposeWithWaitForShortLifespanService(t *testing.T) {
}
func TestDockerComposeWithWaitHTTPStrategy(t *testing.T) {
- path := simpleComposeTestFile
+ path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -243,7 +238,7 @@ func TestDockerComposeWithWaitHTTPStrategy(t *testing.T) {
}
func TestDockerComposeWithContainerName(t *testing.T) {
- path := filepath.Join("testdata", "docker-compose-container-name.yml")
+ path := RenderComposeWithName(t)
identifier := strings.ToLower(uuid.New().String())
@@ -268,7 +263,7 @@ func TestDockerComposeWithContainerName(t *testing.T) {
}
func TestDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
- path := filepath.Join("testdata", "docker-compose-no-exposed-ports.yml")
+ path := filepath.Join(testdataPackage, "docker-compose-no-exposed-ports.yml")
identifier := strings.ToLower(uuid.New().String())
@@ -290,7 +285,7 @@ func TestDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
}
func TestDockerComposeWithMultipleWaitStrategies(t *testing.T) {
- path := complexComposeTestFile
+ path := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -314,7 +309,7 @@ func TestDockerComposeWithMultipleWaitStrategies(t *testing.T) {
}
func TestDockerComposeWithFailedStrategy(t *testing.T) {
- path := simpleComposeTestFile
+ path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -341,7 +336,7 @@ func TestDockerComposeWithFailedStrategy(t *testing.T) {
}
func TestLocalDockerComposeComplex(t *testing.T) {
- path := complexComposeTestFile
+ path := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -363,7 +358,7 @@ func TestLocalDockerComposeComplex(t *testing.T) {
}
func TestLocalDockerComposeWithEnvironment(t *testing.T) {
- path := simpleComposeTestFile
+ path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -394,9 +389,9 @@ func TestLocalDockerComposeWithEnvironment(t *testing.T) {
func TestLocalDockerComposeWithMultipleComposeFiles(t *testing.T) {
composeFiles := []string{
- simpleComposeTestFile,
- filepath.Join("testdata", "docker-compose-postgres.yml"),
- filepath.Join("testdata", "docker-compose-override.yml"),
+ RenderComposeSimple(t),
+ RenderComposePostgres(t),
+ RenderComposeOverride(t),
}
identifier := strings.ToLower(uuid.New().String())
@@ -431,7 +426,7 @@ func TestLocalDockerComposeWithMultipleComposeFiles(t *testing.T) {
}
func TestLocalDockerComposeWithVolume(t *testing.T) {
- path := filepath.Join("testdata", "docker-compose-volume.yml")
+ path := RenderComposeWithVolume(t)
identifier := strings.ToLower(uuid.New().String())
diff --git a/modules/compose/testdata/docker-compose-build.yml b/modules/compose/testdata/docker-compose-build.yml
index 1728e177bd..6e521cf5ed 100644
--- a/modules/compose/testdata/docker-compose-build.yml
+++ b/modules/compose/testdata/docker-compose-build.yml
@@ -7,5 +7,5 @@ services:
FOO: "Hello, World!"
ports:
- target: 8080
- published: 8080
+ published: {{ .Port_0 }}
protocol: tcp
\ No newline at end of file
diff --git a/modules/compose/testdata/docker-compose-complex.yml b/modules/compose/testdata/docker-compose-complex.yml
index 46a674ca04..4099927eb0 100644
--- a/modules/compose/testdata/docker-compose-complex.yml
+++ b/modules/compose/testdata/docker-compose-complex.yml
@@ -3,11 +3,11 @@ services:
nginx:
image: docker.io/nginx:stable-alpine
ports:
- - "9080:80"
+ - "{{ .Port_0 }}:80"
mysql:
image: docker.io/mysql:8.0.36
environment:
- MYSQL_DATABASE=db
- MYSQL_ROOT_PASSWORD=my-secret-pw
ports:
- - "13306:3306"
\ No newline at end of file
+ - "{{ .Port_1 }}:3306"
\ No newline at end of file
diff --git a/modules/compose/testdata/docker-compose-container-name.yml b/modules/compose/testdata/docker-compose-container-name.yml
index db54e1d82f..fbf29c7b2e 100644
--- a/modules/compose/testdata/docker-compose-container-name.yml
+++ b/modules/compose/testdata/docker-compose-container-name.yml
@@ -6,4 +6,4 @@ services:
environment:
bar: ${bar}
ports:
- - "9080:80"
+ - "{{ .Port_0 }}:80"
diff --git a/modules/compose/testdata/docker-compose-override.yml b/modules/compose/testdata/docker-compose-override.yml
index 3fcb135947..91d43d8213 100644
--- a/modules/compose/testdata/docker-compose-override.yml
+++ b/modules/compose/testdata/docker-compose-override.yml
@@ -7,4 +7,4 @@ services:
environment:
MYSQL_RANDOM_ROOT_PASSWORD: Y
ports:
- - "13306:3306"
+ - "{{ .Port_0 }}:3306"
diff --git a/modules/compose/testdata/docker-compose-postgres.yml b/modules/compose/testdata/docker-compose-postgres.yml
index db6720eb3e..d083e0f0fc 100644
--- a/modules/compose/testdata/docker-compose-postgres.yml
+++ b/modules/compose/testdata/docker-compose-postgres.yml
@@ -5,4 +5,4 @@ services:
environment:
POSTGRES_PASSWORD: s3cr3t
ports:
- - "15432:5432"
+ - "{{ .Port_0 }}:5432"
diff --git a/modules/compose/testdata/docker-compose-simple.yml b/modules/compose/testdata/docker-compose-simple.yml
index ddb324cbf7..ffdf25567b 100644
--- a/modules/compose/testdata/docker-compose-simple.yml
+++ b/modules/compose/testdata/docker-compose-simple.yml
@@ -6,4 +6,4 @@ services:
bar: ${bar}
foo: ${foo}
ports:
- - "9080:80"
+ - "{{ .Port_0 }}:80"
diff --git a/modules/compose/testdata/docker-compose-volume.yml b/modules/compose/testdata/docker-compose-volume.yml
index cc14090c53..963c6bb3ec 100644
--- a/modules/compose/testdata/docker-compose-volume.yml
+++ b/modules/compose/testdata/docker-compose-volume.yml
@@ -11,7 +11,7 @@ services:
environment:
bar: ${bar}
ports:
- - "9080:80"
+ - "{{ .Port_0 }}:80"
volumes:
mydata:
From 7aad6e1390603d52ac4500f04fe1b4a73bb00332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 17:24:27 +0200
Subject: [PATCH 11/17] chore: rename local compose testss
---
modules/compose/compose_test.go | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/compose/compose_test.go b/modules/compose/compose_test.go
index 20be7acde4..9aef7ea81b 100644
--- a/modules/compose/compose_test.go
+++ b/modules/compose/compose_test.go
@@ -115,7 +115,7 @@ func TestLocalDockerCompose(t *testing.T) {
checkIfError(t, err)
}
-func TestDockerComposeStrategyForInvalidService(t *testing.T) {
+func TestLocalDockerComposeStrategyForInvalidService(t *testing.T) {
path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -138,7 +138,7 @@ func TestDockerComposeStrategyForInvalidService(t *testing.T) {
assert.Contains(t, compose.Services, "nginx")
}
-func TestDockerComposeWithWaitLogStrategy(t *testing.T) {
+func TestLocalDockerComposeWithWaitLogStrategy(t *testing.T) {
path := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -162,7 +162,7 @@ func TestDockerComposeWithWaitLogStrategy(t *testing.T) {
assert.Contains(t, compose.Services, "mysql")
}
-func TestDockerComposeWithWaitForService(t *testing.T) {
+func TestLocalDockerComposeWithWaitForService(t *testing.T) {
path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -187,7 +187,7 @@ func TestDockerComposeWithWaitForService(t *testing.T) {
assert.Contains(t, compose.Services, "nginx")
}
-func TestDockerComposeWithWaitForShortLifespanService(t *testing.T) {
+func TestLocalDockerComposeWithWaitForShortLifespanService(t *testing.T) {
path := filepath.Join(testdataPackage, "docker-compose-short-lifespan.yml")
identifier := strings.ToLower(uuid.New().String())
@@ -212,7 +212,7 @@ func TestDockerComposeWithWaitForShortLifespanService(t *testing.T) {
assert.Contains(t, compose.Services, "tzatziki")
}
-func TestDockerComposeWithWaitHTTPStrategy(t *testing.T) {
+func TestLocalDockerComposeWithWaitHTTPStrategy(t *testing.T) {
path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -237,7 +237,7 @@ func TestDockerComposeWithWaitHTTPStrategy(t *testing.T) {
assert.Contains(t, compose.Services, "nginx")
}
-func TestDockerComposeWithContainerName(t *testing.T) {
+func TestLocalDockerComposeWithContainerName(t *testing.T) {
path := RenderComposeWithName(t)
identifier := strings.ToLower(uuid.New().String())
@@ -262,7 +262,7 @@ func TestDockerComposeWithContainerName(t *testing.T) {
assert.Contains(t, compose.Services, "nginx")
}
-func TestDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
+func TestLocalDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
path := filepath.Join(testdataPackage, "docker-compose-no-exposed-ports.yml")
identifier := strings.ToLower(uuid.New().String())
@@ -284,7 +284,7 @@ func TestDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
assert.Contains(t, compose.Services, "nginx")
}
-func TestDockerComposeWithMultipleWaitStrategies(t *testing.T) {
+func TestLocalDockerComposeWithMultipleWaitStrategies(t *testing.T) {
path := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -308,7 +308,7 @@ func TestDockerComposeWithMultipleWaitStrategies(t *testing.T) {
assert.Contains(t, compose.Services, "mysql")
}
-func TestDockerComposeWithFailedStrategy(t *testing.T) {
+func TestLocalDockerComposeWithFailedStrategy(t *testing.T) {
path := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
From 05e78f648277626e561405324a4fc2ee907b5a42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Fri, 19 Apr 2024 17:38:50 +0200
Subject: [PATCH 12/17] chore: support returning the dynamic port in the helper
function
---
modules/compose/compose_api_test.go | 31 +++++++++++++------------
modules/compose/compose_builder_test.go | 11 +++++----
modules/compose/compose_test.go | 27 ++++++++++-----------
3 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
index ffbf28026e..f8db108bee 100644
--- a/modules/compose/compose_api_test.go
+++ b/modules/compose/compose_api_test.go
@@ -20,7 +20,7 @@ import (
)
func TestDockerComposeAPI(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -35,7 +35,7 @@ func TestDockerComposeAPI(t *testing.T) {
}
func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -61,7 +61,7 @@ func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
}
func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -86,7 +86,7 @@ func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
}
func TestDockerComposeAPIWithRunServices(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -113,7 +113,7 @@ func TestDockerComposeAPIWithRunServices(t *testing.T) {
}
func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -158,7 +158,7 @@ func TestDockerComposeAPI_WithReaper(t *testing.T) {
t.Skip("Ryuk is disabled, skipping test")
}
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -187,7 +187,7 @@ func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
t.Skip("Ryuk is enabled, skipping test")
}
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
t.Cleanup(func() {
@@ -212,7 +212,7 @@ func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
}
func TestDockerComposeAPIWithStopServices(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerComposeWith(
WithStackFiles(path),
WithLogger(testcontainers.TestLogger(t)))
@@ -249,7 +249,7 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {
}
func TestDockerComposeAPIWithWaitForService(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -276,7 +276,7 @@ func TestDockerComposeAPIWithWaitForService(t *testing.T) {
}
func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -354,7 +354,7 @@ func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {
}
func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -380,7 +380,7 @@ func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
}
func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -409,7 +409,7 @@ func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
}
func TestDockerComposeAPIComplex(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -432,7 +432,7 @@ func TestDockerComposeAPIComplex(t *testing.T) {
func TestDockerComposeAPIWithEnvironment(t *testing.T) {
identifier := testNameHash(t.Name())
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
compose, err := NewDockerComposeWith(WithStackFiles(path), identifier)
require.NoError(t, err, "NewDockerCompose()")
@@ -464,8 +464,9 @@ func TestDockerComposeAPIWithEnvironment(t *testing.T) {
}
func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
+ simple, _ := RenderComposeSimple(t)
composeFiles := ComposeStackFiles{
- RenderComposeSimple(t),
+ simple,
RenderComposePostgres(t),
RenderComposeOverride(t),
}
diff --git a/modules/compose/compose_builder_test.go b/modules/compose/compose_builder_test.go
index 1cc4cb1431..9dd6aab812 100644
--- a/modules/compose/compose_builder_test.go
+++ b/modules/compose/compose_builder_test.go
@@ -14,10 +14,12 @@ const (
testdataPackage = "testdata"
)
-func RenderComposeComplex(t *testing.T) string {
+func RenderComposeComplex(t *testing.T) (string, []int) {
t.Helper()
- return writeTemplate(t, "docker-compose-complex.yml", getFreePort(t), getFreePort(t))
+ ports := []int{getFreePort(t), getFreePort(t)}
+
+ return writeTemplate(t, "docker-compose-complex.yml", ports...), ports
}
func RenderComposeOverride(t *testing.T) string {
@@ -32,10 +34,11 @@ func RenderComposePostgres(t *testing.T) string {
return writeTemplate(t, "docker-compose-postgres.yml", getFreePort(t))
}
-func RenderComposeSimple(t *testing.T) string {
+func RenderComposeSimple(t *testing.T) (string, []int) {
t.Helper()
- return writeTemplate(t, "docker-compose-simple.yml", getFreePort(t))
+ ports := []int{getFreePort(t)}
+ return writeTemplate(t, "docker-compose-simple.yml", ports...), ports
}
func RenderComposeWithBuild(t *testing.T) string {
diff --git a/modules/compose/compose_test.go b/modules/compose/compose_test.go
index 9aef7ea81b..118fc715fe 100644
--- a/modules/compose/compose_test.go
+++ b/modules/compose/compose_test.go
@@ -98,7 +98,7 @@ func ExampleLocalDockerCompose_WithEnv() {
}
func TestLocalDockerCompose(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -116,7 +116,7 @@ func TestLocalDockerCompose(t *testing.T) {
}
func TestLocalDockerComposeStrategyForInvalidService(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, ports := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -130,7 +130,7 @@ func TestLocalDockerComposeStrategyForInvalidService(t *testing.T) {
err := compose.
WithCommand([]string{"up", "-d"}).
// Appending with _1 as given in the Java Test-Containers Example
- WithExposedService(compose.Format("mysql", "1"), 13306, wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WithExposedService(compose.Format("mysql", "1"), ports[0], wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Invoke()
require.Error(t, err.Error, "Expected error to be thrown because service with wait strategy is not running")
@@ -139,7 +139,7 @@ func TestLocalDockerComposeStrategyForInvalidService(t *testing.T) {
}
func TestLocalDockerComposeWithWaitLogStrategy(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -163,7 +163,7 @@ func TestLocalDockerComposeWithWaitLogStrategy(t *testing.T) {
}
func TestLocalDockerComposeWithWaitForService(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -213,7 +213,7 @@ func TestLocalDockerComposeWithWaitForShortLifespanService(t *testing.T) {
}
func TestLocalDockerComposeWithWaitHTTPStrategy(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, ports := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -229,7 +229,7 @@ func TestLocalDockerComposeWithWaitHTTPStrategy(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WithExposedService(compose.Format("nginx", "1"), 9080, wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WithExposedService(compose.Format("nginx", "1"), ports[0], wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Invoke()
checkIfError(t, err)
@@ -285,7 +285,7 @@ func TestLocalDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
}
func TestLocalDockerComposeWithMultipleWaitStrategies(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -309,7 +309,7 @@ func TestLocalDockerComposeWithMultipleWaitStrategies(t *testing.T) {
}
func TestLocalDockerComposeWithFailedStrategy(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, ports := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -325,7 +325,7 @@ func TestLocalDockerComposeWithFailedStrategy(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WithExposedService("nginx_1", 9080, wait.NewHTTPStrategy("/").WithPort("8080/tcp").WithStartupTimeout(5*time.Second)).
+ WithExposedService("nginx_1", ports[0], wait.NewHTTPStrategy("/").WithPort("8080/tcp").WithStartupTimeout(5*time.Second)).
Invoke()
// Verify that an error is thrown and not nil
// A specific error message matcher is not asserted since the docker library can change the return message, breaking this test
@@ -336,7 +336,7 @@ func TestLocalDockerComposeWithFailedStrategy(t *testing.T) {
}
func TestLocalDockerComposeComplex(t *testing.T) {
- path := RenderComposeComplex(t)
+ path, _ := RenderComposeComplex(t)
identifier := strings.ToLower(uuid.New().String())
@@ -358,7 +358,7 @@ func TestLocalDockerComposeComplex(t *testing.T) {
}
func TestLocalDockerComposeWithEnvironment(t *testing.T) {
- path := RenderComposeSimple(t)
+ path, _ := RenderComposeSimple(t)
identifier := strings.ToLower(uuid.New().String())
@@ -388,8 +388,9 @@ func TestLocalDockerComposeWithEnvironment(t *testing.T) {
}
func TestLocalDockerComposeWithMultipleComposeFiles(t *testing.T) {
+ simple, _ := RenderComposeSimple(t)
composeFiles := []string{
- RenderComposeSimple(t),
+ simple,
RenderComposePostgres(t),
RenderComposeOverride(t),
}
From 336760c3011f4d535a9e8f345d02b750d2fa525c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 22 Apr 2024 09:40:56 +0200
Subject: [PATCH 13/17] chore: try with default reconnection timeout
---
.github/workflows/ci-test-go.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
index 36f1e6de4f..7ff5c9b661 100644
--- a/.github/workflows/ci-test-go.yml
+++ b/.github/workflows/ci-test-go.yml
@@ -51,7 +51,6 @@ jobs:
env:
TESTCONTAINERS_RYUK_DISABLED: "${{ inputs.ryuk-disabled }}"
RYUK_CONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '5m' || '60s' }}"
- RYUK_RECONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '30s' || '10s' }}"
steps:
- name: Setup rootless Docker
if: ${{ inputs.rootless-docker }}
From 51539e1b3a133ed4cc385ccd9bb93236c56f101c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 22 Apr 2024 10:41:25 +0200
Subject: [PATCH 14/17] feat: support removing networks from compose
---
docker.go | 4 ++
modules/compose/compose.go | 1 +
modules/compose/compose_api.go | 69 ++++++++++++++++++++++++++++++++++
3 files changed, 74 insertions(+)
diff --git a/docker.go b/docker.go
index 6b8fe42002..426232b229 100644
--- a/docker.go
+++ b/docker.go
@@ -851,6 +851,10 @@ func (n *DockerNetwork) Remove(ctx context.Context) error {
return n.provider.client.NetworkRemove(ctx, n.ID)
}
+func (n *DockerNetwork) SetTerminationSignal(signal chan bool) {
+ n.terminationSignal = signal
+}
+
// DockerProvider implements the ContainerProvider interface
type DockerProvider struct {
*DockerProviderOptions
diff --git a/modules/compose/compose.go b/modules/compose/compose.go
index 82023b86f9..94e2021b90 100644
--- a/modules/compose/compose.go
+++ b/modules/compose/compose.go
@@ -149,6 +149,7 @@ func NewDockerComposeWith(opts ...ComposeStackOption) (*dockerCompose, error) {
dockerClient: dockerCli.Client(),
waitStrategies: make(map[string]wait.Strategy),
containers: make(map[string]*testcontainers.DockerContainer),
+ networks: make(map[string]*testcontainers.DockerNetwork),
sessionID: testcontainers.SessionID(),
reaper: composeReaper,
}
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index 5496a1ef1b..0ea493a066 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -11,6 +11,7 @@ import (
"github.com/compose-spec/compose-go/v2/types"
"github.com/docker/cli/cli/command"
"github.com/docker/compose/v2/pkg/api"
+ dockertypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/client"
@@ -134,6 +135,10 @@ type dockerCompose struct {
// used in ServiceContainer(...) function to avoid calls to the Docker API
containers map[string]*testcontainers.DockerContainer
+ // cache for containers that are part of the stack
+ // used in ServiceContainer(...) function to avoid calls to the Docker API
+ networks map[string]*testcontainers.DockerNetwork
+
// docker/compose API service instance used to control the compose stack
composeService api.Service
@@ -241,6 +246,28 @@ func (d *dockerCompose) Up(ctx context.Context, opts ...StackUpOption) error {
return err
}
+ err = d.lookupNetworks(ctx)
+ if err != nil {
+ return err
+ }
+
+ if d.reaper != nil {
+ for _, n := range d.networks {
+ termSignal, err := d.reaper.Connect()
+ if err != nil {
+ return fmt.Errorf("failed to connect to reaper: %w", err)
+ }
+ n.SetTerminationSignal(termSignal)
+
+ // Cleanup on error, otherwise set termSignal to nil before successful return.
+ defer func() {
+ if termSignal != nil {
+ termSignal <- true
+ }
+ }()
+ }
+ }
+
errGrpContainers, errGrpCtx := errgroup.WithContext(ctx)
for _, srv := range d.project.Services {
@@ -374,6 +401,34 @@ func (d *dockerCompose) lookupContainer(ctx context.Context, svcName string) (*t
return container, nil
}
+func (d *dockerCompose) lookupNetworks(ctx context.Context) error {
+ d.containersLock.Lock()
+ defer d.containersLock.Unlock()
+
+ listOptions := dockertypes.NetworkListOptions{
+ Filters: filters.NewArgs(
+ filters.Arg("label", fmt.Sprintf("%s=%s", api.ProjectLabel, d.name)),
+ ),
+ }
+
+ networks, err := d.dockerClient.NetworkList(ctx, listOptions)
+ if err != nil {
+ return err
+ }
+
+ for _, n := range networks {
+ dn := &testcontainers.DockerNetwork{
+ ID: n.ID,
+ Name: n.Name,
+ Driver: n.Driver,
+ }
+
+ d.networks[n.ID] = dn
+ }
+
+ return nil
+}
+
func (d *dockerCompose) compileProject(ctx context.Context) (*types.Project, error) {
const nameAndDefaultConfigPath = 2
projectOptions := make([]cli.ProjectOptionsFn, len(d.projectOptions), len(d.projectOptions)+nameAndDefaultConfigPath)
@@ -413,6 +468,20 @@ func (d *dockerCompose) compileProject(ctx context.Context) (*types.Project, err
proj.Services[i] = s
}
+ for key, n := range proj.Networks {
+ n.Labels = map[string]string{
+ api.ProjectLabel: proj.Name,
+ api.NetworkLabel: n.Name,
+ api.VersionLabel: api.ComposeVersion,
+ }
+
+ for k, label := range testcontainers.GenericLabels() {
+ n.Labels[k] = label
+ }
+
+ proj.Networks[key] = n
+ }
+
return proj, nil
}
From 6c00d6c7e3b1c116d8660acd77dd75aa4383be49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 22 Apr 2024 11:29:25 +0200
Subject: [PATCH 15/17] chore: support naming test services with local and api
It will allow the tests to be more deterministic, as there could be service containers started from the local test suite with the same name as in the API test suite.
---
modules/compose/compose_api_test.go | 92 +++++++++----------
modules/compose/compose_builder_test.go | 57 ++++++++++++
modules/compose/compose_test.go | 84 ++++++++---------
.../compose/testdata/docker-compose-build.yml | 2 +-
.../testdata/docker-compose-complex.yml | 4 +-
.../docker-compose-container-name.yml | 4 +-
.../docker-compose-no-exposed-ports.yml | 2 +-
.../testdata/docker-compose-override.yml | 4 +-
.../testdata/docker-compose-postgres.yml | 2 +-
.../testdata/docker-compose-simple.yml | 2 +-
.../testdata/docker-compose-volume.yml | 2 +-
11 files changed, 156 insertions(+), 99 deletions(-)
diff --git a/modules/compose/compose_api_test.go b/modules/compose/compose_api_test.go
index f8db108bee..0cf9fcf4f1 100644
--- a/modules/compose/compose_api_test.go
+++ b/modules/compose/compose_api_test.go
@@ -48,16 +48,16 @@ func TestDockerComposeAPIStrategyForInvalidService(t *testing.T) {
err = compose.
// Appending with _1 as given in the Java Test-Containers Example
- WaitForService("mysql-1", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WaitForService("non-existent-srv-1", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Up(ctx, Wait(true))
require.Error(t, err, "Expected error to be thrown because service with wait strategy is not running")
- require.Equal(t, "no container found for service name mysql-1", err.Error())
+ require.Equal(t, "no container found for service name non-existent-srv-1", err.Error())
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
@@ -73,7 +73,7 @@ func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WaitForService("api-mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -81,8 +81,8 @@ func TestDockerComposeAPIWithWaitLogStrategy(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
}
func TestDockerComposeAPIWithRunServices(t *testing.T) {
@@ -98,18 +98,18 @@ func TestDockerComposeAPIWithRunServices(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
- Up(ctx, Wait(true), RunServices("nginx"))
+ WaitForService("api-nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ Up(ctx, Wait(true), RunServices("api-nginx"))
require.NoError(t, err, "compose.Up()")
serviceNames := compose.Services()
- _, err = compose.ServiceContainer(context.Background(), "mysql")
+ _, err = compose.ServiceContainer(context.Background(), "api-mysql")
require.Error(t, err, "Make sure there is no mysql container")
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
@@ -125,7 +125,7 @@ func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WaitForService("api-mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -133,8 +133,8 @@ func TestDockerComposeAPI_TestcontainersLabelsArePresent(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
// all the services in the compose has the Testcontainers Labels
for _, serviceName := range serviceNames {
@@ -168,7 +168,7 @@ func TestDockerComposeAPI_WithReaper(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WaitForService("api-mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -176,8 +176,8 @@ func TestDockerComposeAPI_WithReaper(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
}
func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
@@ -199,7 +199,7 @@ func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WaitForService("api-mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -207,8 +207,8 @@ func TestDockerComposeAPI_WithoutReaper(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
}
func TestDockerComposeAPIWithStopServices(t *testing.T) {
@@ -230,11 +230,11 @@ func TestDockerComposeAPIWithStopServices(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
// close mysql container in purpose
- mysqlContainer, err := compose.ServiceContainer(context.Background(), "mysql")
+ mysqlContainer, err := compose.ServiceContainer(context.Background(), "api-mysql")
require.NoError(t, err, "Get mysql container")
stopTimeout := 10 * time.Second
@@ -264,7 +264,7 @@ func TestDockerComposeAPIWithWaitForService(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WaitForService("nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WaitForService("api-nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -272,7 +272,7 @@ func TestDockerComposeAPIWithWaitForService(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
@@ -291,7 +291,7 @@ func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WaitForService("nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WaitForService("api-nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -299,7 +299,7 @@ func TestDockerComposeAPIWithWaitHTTPStrategy(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPIWithContainerName(t *testing.T) {
@@ -318,7 +318,7 @@ func TestDockerComposeAPIWithContainerName(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WaitForService("nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WaitForService("api-nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -326,11 +326,11 @@ func TestDockerComposeAPIWithContainerName(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {
- path := filepath.Join(testdataPackage, "docker-compose-no-exposed-ports.yml")
+ path := RenderComposeWithoutExposedPorts(t)
compose, err := NewDockerCompose(path)
require.NoError(t, err, "NewDockerCompose()")
@@ -342,7 +342,7 @@ func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("nginx", wait.ForLog("Configuration complete; ready for start up")).
+ WaitForService("api-nginx", wait.ForLog("Configuration complete; ready for start up")).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -350,7 +350,7 @@ func TestDockerComposeAPIWithWaitStrategy_NoExposedPorts(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
@@ -366,8 +366,8 @@ func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second)).
- WaitForService("nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WaitForService("api-mysql", wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second)).
+ WaitForService("api-nginx", wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
@@ -375,8 +375,8 @@ func TestDockerComposeAPIWithMultipleWaitStrategies(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
}
func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
@@ -395,7 +395,7 @@ func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WaitForService("nginx_1", wait.NewHTTPStrategy("/").WithPort("8080/tcp").WithStartupTimeout(5*time.Second)).
+ WaitForService("api-nginx_1", wait.NewHTTPStrategy("/").WithPort("8080/tcp").WithStartupTimeout(5*time.Second)).
Up(ctx, Wait(true))
// Verify that an error is thrown and not nil
@@ -405,7 +405,7 @@ func TestDockerComposeAPIWithFailedStrategy(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
}
func TestDockerComposeAPIComplex(t *testing.T) {
@@ -425,8 +425,8 @@ func TestDockerComposeAPIComplex(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 2)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
}
func TestDockerComposeAPIWithEnvironment(t *testing.T) {
@@ -454,13 +454,13 @@ func TestDockerComposeAPIWithEnvironment(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 1)
- assert.Contains(t, serviceNames, "nginx")
+ assert.Contains(t, serviceNames, "api-nginx")
present := map[string]string{
"bar": "BAR",
}
absent := map[string]string{}
- assertContainerEnvironmentVariables(t, identifier.String(), "nginx", present, absent)
+ assertContainerEnvironmentVariables(t, identifier.String(), "api-nginx", present, absent)
}
func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
@@ -494,16 +494,16 @@ func TestDockerComposeAPIWithMultipleComposeFiles(t *testing.T) {
serviceNames := compose.Services()
assert.Len(t, serviceNames, 3)
- assert.Contains(t, serviceNames, "nginx")
- assert.Contains(t, serviceNames, "mysql")
- assert.Contains(t, serviceNames, "postgres")
+ assert.Contains(t, serviceNames, "api-nginx")
+ assert.Contains(t, serviceNames, "api-mysql")
+ assert.Contains(t, serviceNames, "api-postgres")
present := map[string]string{
"bar": "BAR",
"foo": "FOO",
}
absent := map[string]string{}
- assertContainerEnvironmentVariables(t, identifier.String(), "nginx", present, absent)
+ assertContainerEnvironmentVariables(t, identifier.String(), "api-nginx", present, absent)
}
func TestDockerComposeAPIWithVolume(t *testing.T) {
@@ -562,7 +562,7 @@ func TestDockerComposeAPIWithBuild(t *testing.T) {
t.Cleanup(cancel)
err = compose.
- WaitForService("echo", wait.ForHTTP("/env").WithPort("8080/tcp")).
+ WaitForService("api-echo", wait.ForHTTP("/env").WithPort("8080/tcp")).
Up(ctx, Wait(true))
require.NoError(t, err, "compose.Up()")
diff --git a/modules/compose/compose_builder_test.go b/modules/compose/compose_builder_test.go
index 9dd6aab812..fbfe37baa3 100644
--- a/modules/compose/compose_builder_test.go
+++ b/modules/compose/compose_builder_test.go
@@ -22,18 +22,38 @@ func RenderComposeComplex(t *testing.T) (string, []int) {
return writeTemplate(t, "docker-compose-complex.yml", ports...), ports
}
+func RenderComposeComplexForLocal(t *testing.T) (string, []int) {
+ t.Helper()
+
+ ports := []int{getFreePort(t), getFreePort(t)}
+
+ return writeTemplateWithSrvType(t, "docker-compose-complex.yml", "local", ports...), ports
+}
+
func RenderComposeOverride(t *testing.T) string {
t.Helper()
return writeTemplate(t, "docker-compose-override.yml", getFreePort(t))
}
+func RenderComposeOverrideForLocal(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplateWithSrvType(t, "docker-compose-override.yml", "local", getFreePort(t))
+}
+
func RenderComposePostgres(t *testing.T) string {
t.Helper()
return writeTemplate(t, "docker-compose-postgres.yml", getFreePort(t))
}
+func RenderComposePostgresForLocal(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplateWithSrvType(t, "docker-compose-postgres.yml", "local", getFreePort(t))
+}
+
func RenderComposeSimple(t *testing.T) (string, []int) {
t.Helper()
@@ -41,6 +61,13 @@ func RenderComposeSimple(t *testing.T) (string, []int) {
return writeTemplate(t, "docker-compose-simple.yml", ports...), ports
}
+func RenderComposeSimpleForLocal(t *testing.T) (string, []int) {
+ t.Helper()
+
+ ports := []int{getFreePort(t)}
+ return writeTemplateWithSrvType(t, "docker-compose-simple.yml", "local", ports...), ports
+}
+
func RenderComposeWithBuild(t *testing.T) string {
t.Helper()
@@ -53,12 +80,36 @@ func RenderComposeWithName(t *testing.T) string {
return writeTemplate(t, "docker-compose-container-name.yml", getFreePort(t))
}
+func RenderComposeWithNameForLocal(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplateWithSrvType(t, "docker-compose-container-name.yml", "local", getFreePort(t))
+}
+
+func RenderComposeWithoutExposedPorts(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplate(t, "docker-compose-no-exposed-ports.yml")
+}
+
+func RenderComposeWithoutExposedPortsForLocal(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplateWithSrvType(t, "docker-compose-no-exposed-ports.yml", "local")
+}
+
func RenderComposeWithVolume(t *testing.T) string {
t.Helper()
return writeTemplate(t, "docker-compose-volume.yml", getFreePort(t))
}
+func RenderComposeWithVolumeForLocal(t *testing.T) string {
+ t.Helper()
+
+ return writeTemplateWithSrvType(t, "docker-compose-volume.yml", "local", getFreePort(t))
+}
+
// getFreePort asks the kernel for a free open port that is ready to use.
func getFreePort(t *testing.T) int {
t.Helper()
@@ -78,6 +129,10 @@ func getFreePort(t *testing.T) int {
}
func writeTemplate(t *testing.T, templateFile string, port ...int) string {
+ return writeTemplateWithSrvType(t, templateFile, "api", port...)
+}
+
+func writeTemplateWithSrvType(t *testing.T, templateFile string, srvType string, port ...int) string {
t.Helper()
tmpDir := t.TempDir()
@@ -93,6 +148,8 @@ func writeTemplate(t *testing.T, templateFile string, port ...int) string {
values[fmt.Sprintf("Port_%d", i)] = p
}
+ values["ServiceType"] = srvType
+
output, err := os.Create(composeFile)
if err != nil {
t.Fatalf("creating output file: %s", err)
diff --git a/modules/compose/compose_test.go b/modules/compose/compose_test.go
index 118fc715fe..2453507b06 100644
--- a/modules/compose/compose_test.go
+++ b/modules/compose/compose_test.go
@@ -98,7 +98,7 @@ func ExampleLocalDockerCompose_WithEnv() {
}
func TestLocalDockerCompose(t *testing.T) {
- path, _ := RenderComposeSimple(t)
+ path, _ := RenderComposeSimpleForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -116,7 +116,7 @@ func TestLocalDockerCompose(t *testing.T) {
}
func TestLocalDockerComposeStrategyForInvalidService(t *testing.T) {
- path, ports := RenderComposeSimple(t)
+ path, ports := RenderComposeSimpleForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -130,16 +130,16 @@ func TestLocalDockerComposeStrategyForInvalidService(t *testing.T) {
err := compose.
WithCommand([]string{"up", "-d"}).
// Appending with _1 as given in the Java Test-Containers Example
- WithExposedService(compose.Format("mysql", "1"), ports[0], wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WithExposedService(compose.Format("non-existent-srv", "1"), ports[0], wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Invoke()
require.Error(t, err.Error, "Expected error to be thrown because service with wait strategy is not running")
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
}
func TestLocalDockerComposeWithWaitLogStrategy(t *testing.T) {
- path, _ := RenderComposeComplex(t)
+ path, _ := RenderComposeComplexForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -153,17 +153,17 @@ func TestLocalDockerComposeWithWaitLogStrategy(t *testing.T) {
err := compose.
WithCommand([]string{"up", "-d"}).
// Appending with _1 as given in the Java Test-Containers Example
- WithExposedService(compose.Format("mysql", "1"), 13306, wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
+ WithExposedService(compose.Format("local-mysql", "1"), 13306, wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second).WithOccurrence(1)).
Invoke()
checkIfError(t, err)
assert.Len(t, compose.Services, 2)
- assert.Contains(t, compose.Services, "nginx")
- assert.Contains(t, compose.Services, "mysql")
+ assert.Contains(t, compose.Services, "local-nginx")
+ assert.Contains(t, compose.Services, "local-mysql")
}
func TestLocalDockerComposeWithWaitForService(t *testing.T) {
- path, _ := RenderComposeSimple(t)
+ path, _ := RenderComposeSimpleForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -179,12 +179,12 @@ func TestLocalDockerComposeWithWaitForService(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WaitForService(compose.Format("nginx", "1"), wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WaitForService(compose.Format("local-nginx", "1"), wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Invoke()
checkIfError(t, err)
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
}
func TestLocalDockerComposeWithWaitForShortLifespanService(t *testing.T) {
@@ -213,7 +213,7 @@ func TestLocalDockerComposeWithWaitForShortLifespanService(t *testing.T) {
}
func TestLocalDockerComposeWithWaitHTTPStrategy(t *testing.T) {
- path, ports := RenderComposeSimple(t)
+ path, ports := RenderComposeSimpleForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -229,16 +229,16 @@ func TestLocalDockerComposeWithWaitHTTPStrategy(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WithExposedService(compose.Format("nginx", "1"), ports[0], wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WithExposedService(compose.Format("local-nginx", "1"), ports[0], wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Invoke()
checkIfError(t, err)
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
}
func TestLocalDockerComposeWithContainerName(t *testing.T) {
- path := RenderComposeWithName(t)
+ path := RenderComposeWithNameForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -254,16 +254,16 @@ func TestLocalDockerComposeWithContainerName(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WithExposedService("nginxy", 9080, wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WithExposedService("local-nginxy", 9080, wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Invoke()
checkIfError(t, err)
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
}
func TestLocalDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
- path := filepath.Join(testdataPackage, "docker-compose-no-exposed-ports.yml")
+ path := RenderComposeWithoutExposedPortsForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -276,16 +276,16 @@ func TestLocalDockerComposeWithWaitStrategy_NoExposedPorts(t *testing.T) {
err := compose.
WithCommand([]string{"up", "-d"}).
- WithExposedService(compose.Format("nginx", "1"), 9080, wait.ForLog("Configuration complete; ready for start up")).
+ WithExposedService(compose.Format("local-nginx", "1"), 9080, wait.ForLog("Configuration complete; ready for start up")).
Invoke()
checkIfError(t, err)
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
}
func TestLocalDockerComposeWithMultipleWaitStrategies(t *testing.T) {
- path, _ := RenderComposeComplex(t)
+ path, _ := RenderComposeComplexForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -298,18 +298,18 @@ func TestLocalDockerComposeWithMultipleWaitStrategies(t *testing.T) {
err := compose.
WithCommand([]string{"up", "-d"}).
- WithExposedService(compose.Format("mysql", "1"), 13306, wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second)).
- WithExposedService(compose.Format("nginx", "1"), 9080, wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
+ WithExposedService(compose.Format("local-mysql", "1"), 13306, wait.NewLogStrategy("started").WithStartupTimeout(10*time.Second)).
+ WithExposedService(compose.Format("local-nginx", "1"), 9080, wait.NewHTTPStrategy("/").WithPort("80/tcp").WithStartupTimeout(10*time.Second)).
Invoke()
checkIfError(t, err)
assert.Len(t, compose.Services, 2)
- assert.Contains(t, compose.Services, "nginx")
- assert.Contains(t, compose.Services, "mysql")
+ assert.Contains(t, compose.Services, "local-nginx")
+ assert.Contains(t, compose.Services, "local-mysql")
}
func TestLocalDockerComposeWithFailedStrategy(t *testing.T) {
- path, ports := RenderComposeSimple(t)
+ path, ports := RenderComposeSimpleForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -325,18 +325,18 @@ func TestLocalDockerComposeWithFailedStrategy(t *testing.T) {
WithEnv(map[string]string{
"bar": "BAR",
}).
- WithExposedService("nginx_1", ports[0], wait.NewHTTPStrategy("/").WithPort("8080/tcp").WithStartupTimeout(5*time.Second)).
+ WithExposedService("local-nginx_1", ports[0], wait.NewHTTPStrategy("/").WithPort("8080/tcp").WithStartupTimeout(5*time.Second)).
Invoke()
// Verify that an error is thrown and not nil
// A specific error message matcher is not asserted since the docker library can change the return message, breaking this test
require.Error(t, err.Error, "Expected error to be thrown because of a wrong suplied wait strategy")
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
}
func TestLocalDockerComposeComplex(t *testing.T) {
- path, _ := RenderComposeComplex(t)
+ path, _ := RenderComposeComplexForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -353,12 +353,12 @@ func TestLocalDockerComposeComplex(t *testing.T) {
checkIfError(t, err)
assert.Len(t, compose.Services, 2)
- assert.Contains(t, compose.Services, "nginx")
- assert.Contains(t, compose.Services, "mysql")
+ assert.Contains(t, compose.Services, "local-nginx")
+ assert.Contains(t, compose.Services, "local-mysql")
}
func TestLocalDockerComposeWithEnvironment(t *testing.T) {
- path, _ := RenderComposeSimple(t)
+ path, _ := RenderComposeSimpleForLocal(t)
identifier := strings.ToLower(uuid.New().String())
@@ -378,21 +378,21 @@ func TestLocalDockerComposeWithEnvironment(t *testing.T) {
checkIfError(t, err)
assert.Len(t, compose.Services, 1)
- assert.Contains(t, compose.Services, "nginx")
+ assert.Contains(t, compose.Services, "local-nginx")
present := map[string]string{
"bar": "BAR",
}
absent := map[string]string{}
- assertContainerEnvironmentVariables(t, compose.Identifier, "nginx", present, absent)
+ assertContainerEnvironmentVariables(t, compose.Identifier, "local-nginx", present, absent)
}
func TestLocalDockerComposeWithMultipleComposeFiles(t *testing.T) {
- simple, _ := RenderComposeSimple(t)
+ simple, _ := RenderComposeSimpleForLocal(t)
composeFiles := []string{
simple,
- RenderComposePostgres(t),
- RenderComposeOverride(t),
+ RenderComposePostgresForLocal(t),
+ RenderComposeOverrideForLocal(t),
}
identifier := strings.ToLower(uuid.New().String())
@@ -414,20 +414,20 @@ func TestLocalDockerComposeWithMultipleComposeFiles(t *testing.T) {
checkIfError(t, err)
assert.Len(t, compose.Services, 3)
- assert.Contains(t, compose.Services, "nginx")
- assert.Contains(t, compose.Services, "mysql")
- assert.Contains(t, compose.Services, "postgres")
+ assert.Contains(t, compose.Services, "local-nginx")
+ assert.Contains(t, compose.Services, "local-mysql")
+ assert.Contains(t, compose.Services, "local-postgres")
present := map[string]string{
"bar": "BAR",
"foo": "FOO",
}
absent := map[string]string{}
- assertContainerEnvironmentVariables(t, compose.Identifier, "nginx", present, absent)
+ assertContainerEnvironmentVariables(t, compose.Identifier, "local-nginx", present, absent)
}
func TestLocalDockerComposeWithVolume(t *testing.T) {
- path := RenderComposeWithVolume(t)
+ path := RenderComposeWithVolumeForLocal(t)
identifier := strings.ToLower(uuid.New().String())
diff --git a/modules/compose/testdata/docker-compose-build.yml b/modules/compose/testdata/docker-compose-build.yml
index 6e521cf5ed..88c6ccda40 100644
--- a/modules/compose/testdata/docker-compose-build.yml
+++ b/modules/compose/testdata/docker-compose-build.yml
@@ -1,6 +1,6 @@
version: '3'
services:
- echo:
+ {{ .ServiceType }}-echo:
build:
dockerfile: echoserver.Dockerfile
environment:
diff --git a/modules/compose/testdata/docker-compose-complex.yml b/modules/compose/testdata/docker-compose-complex.yml
index 4099927eb0..f2eacf026a 100644
--- a/modules/compose/testdata/docker-compose-complex.yml
+++ b/modules/compose/testdata/docker-compose-complex.yml
@@ -1,10 +1,10 @@
version: '3'
services:
- nginx:
+ {{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
ports:
- "{{ .Port_0 }}:80"
- mysql:
+ {{ .ServiceType }}-mysql:
image: docker.io/mysql:8.0.36
environment:
- MYSQL_DATABASE=db
diff --git a/modules/compose/testdata/docker-compose-container-name.yml b/modules/compose/testdata/docker-compose-container-name.yml
index fbf29c7b2e..b7e497fd84 100644
--- a/modules/compose/testdata/docker-compose-container-name.yml
+++ b/modules/compose/testdata/docker-compose-container-name.yml
@@ -1,7 +1,7 @@
version: '3'
services:
- nginx:
- container_name: nginxy
+ {{ .ServiceType }}-nginx:
+ container_name: {{ .ServiceType }}-nginxy
image: docker.io/nginx:stable-alpine
environment:
bar: ${bar}
diff --git a/modules/compose/testdata/docker-compose-no-exposed-ports.yml b/modules/compose/testdata/docker-compose-no-exposed-ports.yml
index d1e27913e1..58da1351f4 100644
--- a/modules/compose/testdata/docker-compose-no-exposed-ports.yml
+++ b/modules/compose/testdata/docker-compose-no-exposed-ports.yml
@@ -1,6 +1,6 @@
version: '3'
services:
- nginx:
+ {{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
ports:
- "80"
diff --git a/modules/compose/testdata/docker-compose-override.yml b/modules/compose/testdata/docker-compose-override.yml
index 91d43d8213..8a44e78631 100644
--- a/modules/compose/testdata/docker-compose-override.yml
+++ b/modules/compose/testdata/docker-compose-override.yml
@@ -1,8 +1,8 @@
version: '3'
services:
- nginx:
+ {{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
- mysql:
+ {{ .ServiceType }}-mysql:
image: docker.io/mysql:8.0.36
environment:
MYSQL_RANDOM_ROOT_PASSWORD: Y
diff --git a/modules/compose/testdata/docker-compose-postgres.yml b/modules/compose/testdata/docker-compose-postgres.yml
index d083e0f0fc..7988a43266 100644
--- a/modules/compose/testdata/docker-compose-postgres.yml
+++ b/modules/compose/testdata/docker-compose-postgres.yml
@@ -1,6 +1,6 @@
version: '3'
services:
- postgres:
+ {{ .ServiceType }}-postgres:
image: docker.io/postgres:14
environment:
POSTGRES_PASSWORD: s3cr3t
diff --git a/modules/compose/testdata/docker-compose-simple.yml b/modules/compose/testdata/docker-compose-simple.yml
index ffdf25567b..90b9a4be87 100644
--- a/modules/compose/testdata/docker-compose-simple.yml
+++ b/modules/compose/testdata/docker-compose-simple.yml
@@ -1,6 +1,6 @@
version: '3'
services:
- nginx:
+ {{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
environment:
bar: ${bar}
diff --git a/modules/compose/testdata/docker-compose-volume.yml b/modules/compose/testdata/docker-compose-volume.yml
index 963c6bb3ec..81add904d0 100644
--- a/modules/compose/testdata/docker-compose-volume.yml
+++ b/modules/compose/testdata/docker-compose-volume.yml
@@ -1,6 +1,6 @@
version: '3'
services:
- nginx:
+ {{ .ServiceType }}-nginx:
image: docker.io/nginx:stable-alpine
volumes:
- type: volume
From b40e0617c285931b335046193a147a53371d0ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Mon, 22 Apr 2024 11:38:08 +0200
Subject: [PATCH 16/17] Revert "chore: try with default reconnection timeout"
This reverts commit 336760c3011f4d535a9e8f345d02b750d2fa525c.
---
.github/workflows/ci-test-go.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
index 7ff5c9b661..36f1e6de4f 100644
--- a/.github/workflows/ci-test-go.yml
+++ b/.github/workflows/ci-test-go.yml
@@ -51,6 +51,7 @@ jobs:
env:
TESTCONTAINERS_RYUK_DISABLED: "${{ inputs.ryuk-disabled }}"
RYUK_CONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '5m' || '60s' }}"
+ RYUK_RECONNECTION_TIMEOUT: "${{ inputs.project-directory == 'modules/compose' && '30s' || '10s' }}"
steps:
- name: Setup rootless Docker
if: ${{ inputs.rootless-docker }}
From f702fb80802912f0e524e8511ae77517be2e9aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <social.mdelapenya@gmail.com>
Date: Mon, 22 Apr 2024 11:57:27 +0200
Subject: [PATCH 17/17] fix: typo
---
modules/compose/compose_api.go | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules/compose/compose_api.go b/modules/compose/compose_api.go
index 0ea493a066..62a8061e97 100644
--- a/modules/compose/compose_api.go
+++ b/modules/compose/compose_api.go
@@ -135,8 +135,7 @@ type dockerCompose struct {
// used in ServiceContainer(...) function to avoid calls to the Docker API
containers map[string]*testcontainers.DockerContainer
- // cache for containers that are part of the stack
- // used in ServiceContainer(...) function to avoid calls to the Docker API
+ // cache for networks in the compose stack
networks map[string]*testcontainers.DockerNetwork
// docker/compose API service instance used to control the compose stack