diff --git a/docker.go b/docker.go index 81c844faf4..4e6574ce36 100644 --- a/docker.go +++ b/docker.go @@ -980,6 +980,10 @@ func (p *DockerProvider) CreateContainer(ctx context.Context, req ContainerReque } } + for k, v := range testcontainersdocker.DefaultLabels() { + req.Labels[k] = v + } + dockerInput := &container.Config{ Entrypoint: req.Entrypoint, Image: tag, diff --git a/internal/testcontainersdocker/labels.go b/internal/testcontainersdocker/labels.go index 12742769bd..b8e21b033b 100644 --- a/internal/testcontainersdocker/labels.go +++ b/internal/testcontainersdocker/labels.go @@ -1,5 +1,7 @@ package testcontainersdocker +import "github.com/testcontainers/testcontainers-go/internal" + const ( LabelBase = "org.testcontainers" LabelLang = LabelBase + ".lang" @@ -7,3 +9,11 @@ const ( LabelSessionID = LabelBase + ".sessionId" LabelVersion = LabelBase + ".version" ) + +func DefaultLabels() map[string]string { + return map[string]string{ + LabelBase: "true", + LabelLang: "go", + LabelVersion: internal.Version, + } +} diff --git a/reaper.go b/reaper.go index b72a9bec53..5813f0992a 100644 --- a/reaper.go +++ b/reaper.go @@ -11,7 +11,6 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - "github.com/testcontainers/testcontainers-go/internal" "github.com/testcontainers/testcontainers-go/internal/testcontainersdocker" "github.com/testcontainers/testcontainers-go/wait" ) @@ -198,8 +197,6 @@ func (r *Reaper) Labels() map[string]string { return map[string]string{ TestcontainerLabel: "true", TestcontainerLabelSessionID: r.SessionID, - testcontainersdocker.LabelLang: "go", - testcontainersdocker.LabelVersion: internal.Version, testcontainersdocker.LabelSessionID: r.SessionID, } } diff --git a/reaper_test.go b/reaper_test.go index f392810370..9f955f366d 100644 --- a/reaper_test.go +++ b/reaper_test.go @@ -9,7 +9,6 @@ import ( "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" "github.com/stretchr/testify/assert" - "github.com/testcontainers/testcontainers-go/internal" "github.com/testcontainers/testcontainers-go/internal/config" "github.com/testcontainers/testcontainers-go/internal/testcontainersdocker" "github.com/testcontainers/testcontainers-go/wait" @@ -55,11 +54,9 @@ func createContainerRequest(customize func(ContainerRequest) ContainerRequest) C ReaperImage: "reaperImage", ExposedPorts: []string{"8080/tcp"}, Labels: map[string]string{ - TestcontainerLabel: "true", - TestcontainerLabelIsReaper: "true", - testcontainersdocker.LabelReaper: "true", - testcontainersdocker.LabelLang: "go", - testcontainersdocker.LabelVersion: internal.Version, + TestcontainerLabel: "true", + TestcontainerLabelIsReaper: "true", + testcontainersdocker.LabelReaper: "true", }, Mounts: Mounts(BindMount(testcontainersdocker.ExtractDockerSocket(context.Background()), "/var/run/docker.sock")), WaitingFor: wait.ForListeningPort(nat.Port("8080/tcp")),