Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Add withFileSystemBind + name parameters #206

Merged
merged 3 commits into from
Jan 28, 2022
Merged

Add withFileSystemBind + name parameters #206

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f7bc68
Add `withFileSystemBind` + name parameters
benkio Jan 16, 2022
b0a815f
new parameter at the end
benkio Jan 17, 2022
72836ea
Add a case class for `FileSystemBind` instead of Tuple 3
benkio Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions core/src/main/scala/com/dimafeng/testcontainers/FixedHostPortGenericContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class FixedHostPortGenericContainer(imageName: String,
env: Map[String, String] = Map(),
command: Seq[String] = Seq(),
classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
fileSystemBind: Seq[(String, String, BindMode)] = Seq(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would you mind moving this argument to be last? it'll help to protect those who use positional arguments

waitStrategy: Option[WaitStrategy] = None,
exposedHostPort: Int,
exposedContainerPort: Int
Expand All @@ -23,6 +24,7 @@ class FixedHostPortGenericContainer(imageName: String,
container.withCommand(command: _*)
}
classpathResourceMapping.foreach{ case (r, c, m) => container.withClasspathResourceMapping(r, c, m) }
fileSystemBind.foreach{ case (r, c, m) => container.withFileSystemBind(r, c, m) }
waitStrategy.foreach(container.waitingFor)
container.withFixedExposedPort(exposedHostPort, exposedContainerPort)
}
Expand All @@ -33,16 +35,19 @@ object FixedHostPortGenericContainer {
env: Map[String, String] = Map(),
command: Seq[String] = Seq(),
classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
fileSystemBind: Seq[(String, String, BindMode)] = Seq(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one too

waitStrategy: WaitStrategy = null,
exposedHostPort: Int,
exposedContainerPort: Int): FixedHostPortGenericContainer=
new FixedHostPortGenericContainer(imageName,
exposedPorts,
env,
command,
classpathResourceMapping,
Option(waitStrategy),
exposedHostPort,
exposedContainerPort
new FixedHostPortGenericContainer(
imageName = imageName,
exposedPorts = exposedPorts,
env = env,
command = command,
classpathResourceMapping = classpathResourceMapping,
fileSystemBind = fileSystemBind,
waitStrategy = Option(waitStrategy),
exposedHostPort = exposedHostPort,
exposedContainerPort = exposedContainerPort
)
}
45 changes: 39 additions & 6 deletions core/src/main/scala/com/dimafeng/testcontainers/GenericContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class GenericContainer(
env: Map[String, String] = Map(),
command: Seq[String] = Seq(),
classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
fileSystemBind: Seq[(String, String, BindMode)] = Seq(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And in this class please

waitStrategy: Option[WaitStrategy] = None,
labels: Map[String, String] = Map.empty,
tmpFsMapping: Map[String, String] = Map.empty,
Expand All @@ -39,6 +40,7 @@ class GenericContainer(
underlying.withCommand(command: _*)
}
classpathResourceMapping.foreach{ case (r, c, m) => underlying.withClasspathResourceMapping(r, c, m) }
fileSystemBind.foreach{ case (r, c, m) => underlying.withFileSystemBind(r, c, m) }
waitStrategy.foreach(underlying.waitingFor)

if (labels.nonEmpty) {
Expand Down Expand Up @@ -73,12 +75,23 @@ object GenericContainer {
env: Map[String, String] = Map(),
command: Seq[String] = Seq(),
classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
fileSystemBind: Seq[(String, String, BindMode)] = Seq(),
waitStrategy: WaitStrategy = null,
labels: Map[String, String] = Map.empty,
tmpFsMapping: Map[String, String] = Map.empty,
imagePullPolicy: ImagePullPolicy = null): GenericContainer =
new GenericContainer(dockerImage, exposedPorts, env, command, classpathResourceMapping, Option(waitStrategy), labels, tmpFsMapping,
Option(imagePullPolicy))
new GenericContainer(
dockerImage = dockerImage,
exposedPorts = exposedPorts,
env = env,
command = command,
classpathResourceMapping = classpathResourceMapping,
fileSystemBind = fileSystemBind,
waitStrategy = Option(waitStrategy),
labels = labels,
tmpFsMapping = tmpFsMapping,
imagePullPolicy = Option(imagePullPolicy)
)

abstract class Def[C <: GenericContainer](init: => C) extends ContainerDef {
override type Container = C
Expand All @@ -92,27 +105,47 @@ object GenericContainer {
env: Map[String, String] = Map(),
command: Seq[String] = Seq(),
classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
fileSystemBind: 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)
dockerImage = dockerImage,
exposedPorts = exposedPorts,
env = env,
command = command,
classpathResourceMapping = classpathResourceMapping,
fileSystemBind = fileSystemBind,
waitStrategy = waitStrategy,
labels = labels,
tmpFsMapping = tmpFsMapping,
imagePullPolicy = imagePullPolicy
)
)

def apply(dockerImage: DockerImage,
exposedPorts: Seq[Int] = Seq(),
env: Map[String, String] = Map(),
command: Seq[String] = Seq(),
classpathResourceMapping: Seq[(String, String, BindMode)] = Seq(),
fileSystemBind: 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)
dockerImage = dockerImage,
exposedPorts = exposedPorts,
env = env,
command = command,
classpathResourceMapping = classpathResourceMapping,
fileSystemBind = fileSystemBind,
waitStrategy = waitStrategy,
labels = labels,
tmpFsMapping = tmpFsMapping,
imagePullPolicy = imagePullPolicy
)

}

Expand Down