Add alias for creating a generic container definition

README.md

@@ -181,13 +181,13 @@ The most flexible but less convenient container type is `GenericContainer`. This
 with custom configuration.
 
 ```scala
-class GenericContainerSpec extends AnyFlatSpec with ForAllTestContainer {
-  override val container: GenericContainer = GenericContainer("nginx:latest",
+class GenericContainerSpec extends AnyFlatSpec with TestContainerForAll {
+  override val containerDef = GenericContainer.Def("nginx:latest",
     exposedPorts = Seq(80),
     waitStrategy = Wait.forHttp("/")
   )
 
-  "GenericContainer" should "start nginx and expose 80 port" in {
+  "GenericContainer" should "start nginx and expose 80 port" in withContainers { case container =>
     assert(Source.fromInputStream(
       new URL(s"http://${container.containerIpAddress}:${container.mappedPort(80)}/").openConnection().getInputStream
     ).mkString.contains("If you see this page, the nginx web server is successfully installed"))

core/src/main/scala/com/dimafeng/testcontainers/GenericContainer.scala

@@ -83,4 +83,36 @@ object GenericContainer {
     override type Container = C
     protected def createContainer(): C = init
   }
+
+  object Def {
+
+    private final case class Default(dockerImage: DockerImage,
+                                     exposedPorts: Seq[Int] = Seq(),
+                                     env: Map[String, String] = Map(),
+                                     command: Seq[String] = Seq(),
+                                     classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
+                                     waitStrategy: WaitStrategy = null,
+                                     labels: Map[String, String] = Map.empty,
+                                     tmpFsMapping: Map[String, String] = Map.empty,
+                                     imagePullPolicy: ImagePullPolicy = null) extends Def[GenericContainer](
+      GenericContainer(
+        dockerImage, exposedPorts, env, command, classpathResourceMapping, waitStrategy, 
+        labels, tmpFsMapping, imagePullPolicy)
+    )
+
+    def apply(dockerImage: DockerImage,
+              exposedPorts: Seq[Int] = Seq(),
+              env: Map[String, String] = Map(),
+              command: Seq[String] = Seq(),
+              classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
+              waitStrategy: WaitStrategy = null,
+              labels: Map[String, String] = Map.empty,
+              tmpFsMapping: Map[String, String] = Map.empty,
+              imagePullPolicy: ImagePullPolicy = null): GenericContainer.Def[GenericContainer] = 
+      Default(
+        dockerImage, exposedPorts, env, command, classpathResourceMapping, waitStrategy, 
+        labels, tmpFsMapping, imagePullPolicy)
+
+  }
+
 }

test-framework/scalatest/src/test/scala/com/dimafeng/testcontainers/GenericContainerSpec.scala

@@ -0,0 +1,20 @@
+package com.dimafeng.testcontainers
+
+import org.scalatest.flatspec.AnyFlatSpec
+import scala.io.Source
+import java.net.URL
+import com.dimafeng.testcontainers.scalatest.TestContainerForAll
+import org.testcontainers.containers.wait.strategy.Wait
+
+class GenericContainerSpec extends AnyFlatSpec with TestContainerForAll {
+  override val containerDef = GenericContainer.Def("nginx:latest",
+    exposedPorts = Seq(80),
+    waitStrategy = Wait.forHttp("/")
+  )
+
+  "GenericContainer" should "start nginx and expose 80 port" in withContainers { case container =>
+    assert(Source.fromInputStream(
+      new URL(s"http://${container.containerIpAddress}:${container.mappedPort(80)}/").openConnection().getInputStream
+    ).mkString.contains("If you see this page, the nginx web server is successfully installed"))
+  }
+}