feat: add support for envfiles

Author: j5ik2o

build.sbt

@@ -213,13 +213,14 @@ val `docker-controller-scala-root` = (project in file("."))
     `docker-controller-scala-core`,
     `docker-controller-scala-scalatest`,
     `docker-controller-scala-mysql`,
-    `docker-controller-scala-redis`,
     `docker-controller-scala-dynamodb-local`,
     `docker-controller-scala-minio`,
     `docker-controller-scala-zookeeper`,
     `docker-controller-scala-kafka`,
     `docker-controller-scala-elasticsearch`,
-    `docker-controller-scala-localstack`
+    `docker-controller-scala-localstack`,
+    `docker-controller-scala-redis`,
+    `docker-controller-scala-elasticmq`
   )
 
 // --- Custom commands

docker-controller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerComposeController.scala

@@ -4,20 +4,27 @@ import com.github.dockerjava.api.DockerClient
 import com.github.dockerjava.api.command.CreateContainerCmd
 import com.github.dockerjava.api.model.HostConfig.newHostConfig
 import com.github.dockerjava.api.model.{ AccessMode, Bind, SELContext, Volume }
+import org.apache.commons.io.FileUtils
 import org.seasar.util.io.ResourceUtil
 
 import java.io.File
-import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 import scala.concurrent.duration.{ DurationInt, FiniteDuration }
 
 object DockerComposeController {
 
   def apply(dockerClient: DockerClient, outputFrameInterval: FiniteDuration = 500.millis)(
       dockerComposeWorkingDir: File,
       ymlResourceName: String,
+      environmentNames: Seq[String],
       context: Map[String, AnyRef]
   ): DockerController =
-    new DockerComposeController(dockerClient, outputFrameInterval)(dockerComposeWorkingDir, ymlResourceName, context)
+    new DockerComposeController(dockerClient, outputFrameInterval)(
+      dockerComposeWorkingDir,
+      ymlResourceName,
+      environmentNames,
+      context
+    )
 }
 
 private[dockerController] class DockerComposeController(
@@ -26,17 +33,35 @@ private[dockerController] class DockerComposeController(
 )(
     val dockerComposeWorkingDir: File,
     val ymlResourceName: String,
+    val environmentResourceNames: Seq[String],
     val context: Map[String, AnyRef]
 ) extends DockerControllerImpl(dockerClient, outputFrameInterval)("docker/compose", Some("1.24.1")) {
 
   override protected def newCreateContainerCmd(): CreateContainerCmd = {
+    val id = Base58.randomString(16)
+    if (!dockerComposeWorkingDir.exists()) dockerComposeWorkingDir.mkdir()
     val ymlFile = if (ymlResourceName.endsWith(".ftl")) {
-      if (!dockerComposeWorkingDir.exists()) dockerComposeWorkingDir.mkdir()
-      val file = Files.createTempFile(dockerComposeWorkingDir.toPath, "docker-compose-", ".yml").toFile
-      DockerComposeYmlGen.generate(ymlResourceName, context, file)
+      val file = new File(dockerComposeWorkingDir, s"docker-compose-$id.yml")
+      DockerComposeFileGen.generate(ymlResourceName, context + ("id" -> id), file)
       file
-    } else
-      ResourceUtil.getResourceAsFile(ymlResourceName)
+    } else {
+      val srcFile  = ResourceUtil.getResourceAsFile(ymlResourceName)
+      val destFile = new File(dockerComposeWorkingDir, srcFile.getName)
+      FileUtils.copyFile(srcFile, destFile, StandardCopyOption.REPLACE_EXISTING)
+      destFile
+    }
+
+    environmentResourceNames.foreach { environmentResourceName =>
+      if (environmentResourceName.endsWith(".ftl")) {
+        val Array(base, ext, _) = environmentResourceName.split("\\.")
+        val file                = new File(dockerComposeWorkingDir, s"$base-$id.$ext")
+        DockerComposeFileGen.generate(environmentResourceName, context, file)
+      } else {
+        val srcFile  = ResourceUtil.getResourceAsFile(environmentResourceName)
+        val destFile = new File(dockerComposeWorkingDir, srcFile.getName)
+        FileUtils.copyFile(srcFile, destFile, StandardCopyOption.REPLACE_EXISTING)
+      }
+    }
 
     val baseDir    = ymlFile.getParentFile
     val bind       = new Bind(baseDir.getPath, new Volume(baseDir.getPath), AccessMode.ro, SELContext.none)

docker-controller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerComposeYmlGen.scala renamed to docker-controller-scala-core/src/main/scala/com/github/j5ik2o/dockerController/DockerComposeFileGen.scala

@@ -7,7 +7,7 @@ import java.io.{ File, FileWriter }
 import java.util.Locale
 import scala.jdk.CollectionConverters._
 
-object DockerComposeYmlGen {
+object DockerComposeFileGen {
 
   final val FreemarkerVersion = Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS
 

docker-controller-scala-core/src/test/resources/docker-compose-3.yml.ftl

@@ -0,0 +1,8 @@
+version: '3'
+services:
+  nginx:
+    image: bithavoc/hello-world-env
+    ports:
+      - ${hostPort}:3000
+    env_file:
+      - ./settings-${id}.env

docker-controller-scala-core/src/test/resources/settings.env.ftl

@@ -0,0 +1 @@
+MESSAGE=${message}

docker-controller-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeController2Spec.scala

@@ -0,0 +1,99 @@
+package com.github.j5ik2o.dockerController
+
+import com.github.dockerjava.api.DockerClient
+import com.github.dockerjava.core.{ DockerClientConfig, DockerClientImpl }
+import com.github.dockerjava.httpclient5.ApacheDockerHttpClient
+import org.apache.commons.io.IOUtils
+import org.scalatest.freespec.AnyFreeSpec
+import org.scalatest.{ BeforeAndAfter, BeforeAndAfterAll }
+import org.seasar.util.io.ResourceUtil
+import org.slf4j.{ Logger, LoggerFactory }
+
+import java.io.{ File, InputStream }
+import java.net.{ HttpURLConnection, URL }
+import java.time.Instant
+import scala.concurrent.duration.Duration
+import scala.jdk.CollectionConverters._
+
+class DockerComposeController2Spec extends AnyFreeSpec with BeforeAndAfter with BeforeAndAfterAll {
+  val logger: Logger = LoggerFactory.getLogger(getClass)
+
+  val dockerClientConfig: DockerClientConfig = DockerClientConfigUtil.buildConfigAwareOfDockerMachine()
+
+  val dockerClient: DockerClient = {
+    val httpClient: ApacheDockerHttpClient = new ApacheDockerHttpClient.Builder()
+      .dockerHost(dockerClientConfig.getDockerHost).sslConfig(dockerClientConfig.getSSLConfig).build()
+    DockerClientImpl.getInstance(dockerClientConfig, httpClient)
+  }
+
+  val host: String = DockerClientConfigUtil.dockerHost(dockerClientConfig)
+
+  val hostPort: Int = RandomPortUtil.temporaryServerPort()
+
+  val url = new URL(s"http://$host:$hostPort")
+
+  def wget: Unit = {
+    var connection: HttpURLConnection = null
+    var in: InputStream               = null
+    try {
+      connection = url.openConnection().asInstanceOf[HttpURLConnection]
+      connection.setRequestMethod("GET")
+      connection.connect()
+      val responseCode = connection.getResponseCode
+      assert(responseCode == HttpURLConnection.HTTP_OK)
+      in = connection.getInputStream
+      val lines = IOUtils.readLines(in, "UTF-8").asScala.mkString("\n")
+      println(lines)
+    } catch {
+      case ex: Throwable =>
+        ex.printStackTrace()
+    } finally {
+      if (in != null)
+        in.close()
+      if (connection != null)
+        connection.disconnect()
+    }
+  }
+
+  var dockerController: DockerController = _
+
+  override protected def beforeAll(): Unit = {
+    val buildDir: File                = ResourceUtil.getBuildDir(getClass)
+    val dockerComposeWorkingDir: File = new File(buildDir, "docker-compose")
+    dockerController = DockerComposeController(dockerClient)(
+      dockerComposeWorkingDir,
+      "docker-compose-3.yml.ftl",
+      Seq("settings.env.ftl"),
+      Map("hostPort" -> hostPort.toString, "message" -> Instant.now().toString)
+    )
+    dockerController.pullImageIfNotExists()
+    dockerController.createContainer()
+  }
+
+  override protected def afterAll(): Unit = {
+    dockerController.removeContainer()
+    dockerClient.close()
+  }
+
+  before {
+    dockerController.startContainer()
+    dockerController.awaitCondition(Duration.Inf)(
+      _.toString.contains("Listening on port 3000")
+    )
+    Thread.sleep(1000)
+  }
+
+  after {
+    dockerController.stopContainer()
+  }
+
+  "DockerComposeController" - {
+    "run-1" in {
+      wget
+    }
+    "run-2" in {
+      wget
+    }
+
+  }
+}

docker-controller-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeControllerSpec.scala

@@ -62,6 +62,7 @@ class DockerComposeControllerSpec extends AnyFreeSpec with BeforeAndAfter with B
     dockerController = DockerComposeController(dockerClient)(
       dockerComposeWorkingDir,
       "docker-compose-2.yml.ftl",
+      Seq.empty,
       Map("nginxHostPort" -> hostPort.toString)
     )
     dockerController.pullImageIfNotExists()

docker-controller-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeYmlGenSpec.scala renamed to docker-controller-scala-core/src/test/scala/com/github/j5ik2o/dockerController/DockerComposeFileGenSpec.scala

@@ -4,12 +4,12 @@ import org.scalatest.freespec.AnyFreeSpec
 
 import java.nio.file.{ Files, Paths }
 
-class DockerComposeYmlGenSpec extends AnyFreeSpec {
+class DockerComposeFileGenSpec extends AnyFreeSpec {
   "DockerComposeYmlGenSpec" - {
     "generate" in {
       val tmpFile = Files.createTempFile(Paths.get("/tmp"), "docker-compose-", ".yml")
 
-      DockerComposeYmlGen.generate(
+      DockerComposeFileGen.generate(
         "docker-compose-2.yml.ftl",
         Map("nginxHostPort" -> Integer.valueOf(8080)),
         tmpFile.toFile