Exposed option to force docker pull for each task

mesosphere · Apr 14, 2015 · 2a65700 · 2a65700 · hekaldama · Apr 15, 2015
1 parent c2e86b1
commit 2a65700
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 33 deletions.
diff --git a/docs/docs/native-docker.md b/docs/docs/native-docker.md
@@ -174,6 +174,21 @@ config file.
 
 ### Advanced Usage
 
+#### Forcing a Docker Pull
+
+Marathon 0.8.2 with Mesos 0.22.0 supports an option to force Docker to pull
+the image before launching each task.
+
+```json
+{
+  "type": "DOCKER",
+  "docker": {
+    "image": "group/image",
+    "forcePullImage": true
+  }
+}
+```
+
 #### Command vs Args
 
 As of version 0.7.0, Marathon supports an `args` field in the app JSON.  It is

diff --git a/examples/Docker.json b/examples/Docker.json
@@ -4,6 +4,7 @@
     "docker": {
       "image": "libmesos/ubuntu"
     },
+    "forcePullImage": false,
     "volumes" : [
       {
         "containerPath": "/etc/a",

diff --git a/src/main/java/mesosphere/marathon/Protos.java b/src/main/java/mesosphere/marathon/Protos.java
diff --git a/src/main/proto/marathon.proto b/src/main/proto/marathon.proto
@@ -117,6 +117,11 @@ message ExtendedContainerInfo {
     // to be supported moving forward, as we might move away from
     // the docker CLI.
     repeated mesos.Parameter parameters = 5;
+
+    // With this flag set to true, the docker containerizer will
+    // pull the docker image from the registry even if the image
+    // is already downloaded on the slave.
+    optional bool force_pull_image = 6;
   }
 
   required mesos.ContainerInfo.Type type = 1;

diff --git a/src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala b/src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala
@@ -172,8 +172,9 @@ trait ContainerFormats {
     (__ \ "network").formatNullable[Network] ~
     (__ \ "portMappings").formatNullable[Seq[Docker.PortMapping]] ~
     (__ \ "privileged").formatNullable[Boolean].withDefault(false) ~
-    (__ \ "parameters").formatNullable[Seq[Parameter]].withDefault(Seq.empty)
-  )(Docker(_, _, _, _, _), unlift(Docker.unapply))
+    (__ \ "parameters").formatNullable[Seq[Parameter]].withDefault(Seq.empty) ~
+    (__ \ "forcePullImage").formatNullable[Boolean].withDefault(false)
+  )(Docker(_, _, _, _, _, _), unlift(Docker.unapply))
 
   implicit val ModeFormat: Format[mesos.Volume.Mode] =
     enumFormat(mesos.Volume.Mode.valueOf, str => s"$str is not a valid mode")

diff --git a/src/main/scala/mesosphere/marathon/state/Container.scala b/src/main/scala/mesosphere/marathon/state/Container.scala
@@ -94,7 +94,8 @@ object Container {
       network: Option[mesos.ContainerInfo.DockerInfo.Network] = None,
       portMappings: Option[Seq[Docker.PortMapping]] = None,
       privileged: Boolean = false,
-      parameters: Seq[Parameter] = Nil) {
+      parameters: Seq[Parameter] = Nil,
+      forcePullImage: Boolean = false) {
 
     def toProto(): Protos.ExtendedContainerInfo.DockerInfo = {
       val builder = Protos.ExtendedContainerInfo.DockerInfo.newBuilder
@@ -111,6 +112,8 @@ object Container {
 
       builder.addAllParameters(parameters.map(_.toProto).asJava)
 
+      builder.setForcePullImage(forcePullImage)
+
       builder.build
     }
 
@@ -129,6 +132,8 @@ object Container {
 
       builder.addAllParameters(parameters.map(_.toProto).asJava)
 
+      builder.setForcePullImage(forcePullImage)
+
       builder.build
     }
 
@@ -150,7 +155,9 @@ object Container {
 
         privileged = proto.getPrivileged,
 
-        parameters = proto.getParametersList.asScala.map(Parameter(_)).to[Seq]
+        parameters = proto.getParametersList.asScala.map(Parameter(_)).to[Seq],
+
+        forcePullImage = if (proto.hasForcePullImage) proto.getForcePullImage else false
       )
 
     /**