Add default labels when Ryuk is disabled (testcontainers#1339)

* Add org.testcontainers label

For consistency with the other Testcontainers lang implementations,
label `org.testcontainers=true` should be added.

* Add default labels when ryuk is disabled

* Remove default labels from reaper as they would be added later

* Fix test

* Fix lint

* Do not use map reference

* Update internal/testcontainersdocker/labels.go

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>

* Update docker.go

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>

---------

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>

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,

internal/testcontainersdocker/labels.go

@@ -1,9 +1,19 @@
 package testcontainersdocker
 
+import "github.com/testcontainers/testcontainers-go/internal"
+
 const (
  LabelBase = "org.testcontainers"
  LabelLang = LabelBase + ".lang"
  LabelReaper = LabelBase + ".reaper"
  LabelSessionID = LabelBase + ".sessionId"
  LabelVersion = LabelBase + ".version"
 )
+
+func DefaultLabels() map[string]string {
+ return map[string]string{
+ LabelBase: "true",
+ LabelLang: "go",
+ LabelVersion: internal.Version,
+ }
+}

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,
  }
 }

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")),