Move memory and memoryReservation into HostConfig

Author: Chris Birchall

config/src/main/scala/com/whisk/docker/config/DockerTypesafeConfig.scala

@@ -1,7 +1,7 @@
 package com.whisk.docker.config
 
 import com.whisk.docker.impl.dockerjava.DockerKitDockerJava
-import com.whisk.docker.{DockerContainer, DockerPortMapping, DockerReadyChecker, VolumeMapping}
+import com.whisk.docker.{DockerContainer, DockerPortMapping, DockerReadyChecker, HostConfig, VolumeMapping}
 
 import scala.concurrent.duration._
 
@@ -62,6 +62,11 @@ object DockerTypesafeConfig extends DockerKitDockerJava {
 
       val readyChecker = `ready-checker`.fold[DockerReadyChecker](AlwaysReady) { _.toReadyChecker }
 
+      val hostConfig = HostConfig(
+        memory = memory,
+        memoryReservation = `memory-reservation`
+      )
+
       DockerContainer(
         image = `image-name`,
         name = `container-name`,
@@ -71,8 +76,7 @@ object DockerTypesafeConfig extends DockerKitDockerJava {
         env = `environmental-variables`,
         readyChecker = readyChecker,
         volumeMappings = `volume-maps`,
-        memory = memory,
-        memoryReservation = `memory-reservation`
+        hostConfig = Some(hostConfig)
       )
     }
   }

config/src/test/scala/com/whisk/docker/config/test/DockerConfigSpec.scala

@@ -1,6 +1,6 @@
 package com.whisk.docker.config.test
 
-import com.whisk.docker.{DockerContainer, DockerReadyChecker, VolumeMapping}
+import com.whisk.docker.{DockerContainer, DockerReadyChecker, HostConfig, VolumeMapping}
 import com.whisk.docker.config.DockerKitConfig
 import org.scalatest._
 
@@ -40,8 +40,7 @@ class DockerConfigSpec extends FlatSpec with Matchers with DockerKitConfig {
     val elasticExpected = DockerContainer("elasticsearch:1.7.1")
       .withEntrypoint("my", "custom", "entrypoint")
       .withPorts(9200 -> None, 9300 -> None)
-      .withMemory(536870912)
-      .withMemoryReservation(268435456)
+      .withHostConfig(HostConfig(memory = Some(536870912), memoryReservation = Some(268435456)))
       .withReadyChecker(
         DockerReadyChecker
           .HttpResponseCode(9200, "/")

core/src/main/scala/com/whisk/docker/DockerContainer.scala

@@ -11,7 +11,19 @@ case class LogLineReceiver(withErr: Boolean, f: String => Unit)
 case class DockerPortMapping(hostPort: Option[Int] = None, address: String = "0.0.0.0")
 
 case class HostConfig(
-    tmpfs: Option[Map[String, String]] = None
+
+    tmpfs: Option[Map[String, String]] = None,
+
+    /**
+      * the hard limit on memory usage (in bytes)
+      */
+    memory: Option[Long] = None,
+
+    /**
+      * the soft limit on memory usage (in bytes)
+      */
+    memoryReservation: Option[Long] = None
+
 )
 
 case class DockerContainer(image: String,
@@ -30,8 +42,6 @@ case class DockerContainer(image: String,
                            logLineReceiver: Option[LogLineReceiver] = None,
                            user: Option[String] = None,
                            hostname: Option[String] = None,
-                           memory: Option[Long] = None,
-                           memoryReservation: Option[Long] = None,
                            hostConfig: Option[HostConfig] = None) {
 
   def withCommand(cmd: String*) = copy(command = Some(cmd))
@@ -65,16 +75,6 @@ case class DockerContainer(image: String,
 
   def withHostname(hostname: String) = copy(hostname = Some(hostname))
 
-  /**
-    * Set the hard limit on memory usage (in bytes)
-    */
-  def withMemory(memory: Long) = copy(memory = Some(memory))
-
-  /**
-    * Set the soft limit on memory usage (in bytes)
-    */
-  def withMemoryReservation(memoryReservation: Long) = copy(memoryReservation = Some(memoryReservation))
-
   def withHostConfig(hostConfig: HostConfig) = copy(hostConfig = Some(hostConfig))
 
 }

impl/docker-java/src/main/scala/com/whisk/docker/impl/dockerjava/DockerJavaExecutor.scala

@@ -40,6 +40,12 @@ class DockerJavaExecutor(override val host: String, client: DockerClient)
         }: _*)
       )
       .withBinds(new Binds(volumeToBind.map(_._2): _*))
+      .withOption(spec.hostConfig.flatMap(_.memory)) {
+        case (config, memory) => config.withMemory(memory)
+      }
+      .withOption(spec.hostConfig.flatMap(_.memoryReservation)) {
+        case (config, memoryReservation) => config.withMemoryReservation(memoryReservation)
+      }
 
     val cmd = client
       .createContainerCmd(spec.image)
@@ -61,10 +67,6 @@ class DockerJavaExecutor(override val host: String, client: DockerClient)
       .withOption(spec.name) { case (config, name) => config.withName(name) }
       .withOption(spec.command) { case (config, c) => config.withCmd(c: _*) }
       .withOption(spec.entrypoint) { case (config, entrypoint) => config.withEntrypoint(entrypoint: _*) }
-      .withOption(spec.memory) { case (config, memory) => config.withMemory(memory) }
-      .withOption(spec.memoryReservation) { case (config, memoryReservation) =>
-        config.withHostConfig(config.getHostConfig.withMemoryReservation(memoryReservation))
-      }
 
     Future(cmd.exec()).map { resp =>
       if (resp.getId != null && resp.getId != "") {

impl/spotify/src/main/scala/com/whisk/docker/impl/spotify/SpotifyDockerCommandExecutor.scala

@@ -48,12 +48,18 @@ class SpotifyDockerCommandExecutor(override val host: String, client: DockerClie
       val hostConfigBuilder =
         if (links.isEmpty) hostConfigBase else hostConfigBase.links(links.asJava)
       hostConfigBuilder
+        .withOption(spec.networkMode) {
+          case (config, networkMode) => config.networkMode(networkMode)
+        }
         .withOption(spec.hostConfig.flatMap(_.tmpfs)) {
           case (config, value) => config.tmpfs(value.asJava)
         }
-        .withOption(spec.networkMode) { case (config, networkMode) => config.networkMode(networkMode) }
-        .withOption(spec.memory) { case (config, memory) => config.memory(memory) }
-        .withOption(spec.memoryReservation) { case (config, reservation) => config.memoryReservation(reservation) }
+        .withOption(spec.hostConfig.flatMap(_.memory)) {
+          case (config, memory) => config.memory(memory)
+        }
+        .withOption(spec.hostConfig.flatMap(_.memoryReservation)) {
+          case (config, reservation) => config.memoryReservation(reservation)
+        }
         .build()
     }