You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2015/07/17 01:04:14 UTC

mesos git commit: Add ContainerImage protobuf.

Repository: mesos
Updated Branches:
  refs/heads/master bfe6c07b7 -> 661010c13


Add ContainerImage protobuf.

Review: https://reviews.apache.org/r/34136


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/661010c1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/661010c1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/661010c1

Branch: refs/heads/master
Commit: 661010c135818660c4da12da965c82041b51f365
Parents: bfe6c07
Author: Ian Downes <ia...@gmail.com>
Authored: Thu Jul 16 14:45:57 2015 -0700
Committer: Timothy Chen <tn...@apache.org>
Committed: Thu Jul 16 16:04:08 2015 -0700

----------------------------------------------------------------------
 include/mesos/mesos.proto | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/661010c1/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 1763129..d2f4826 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -1197,11 +1197,44 @@ message ContainerInfo {
     optional bool force_pull_image = 6;
   }
 
+  message Image {
+    enum Type {
+      APPC = 1;
+    }
+
+    // Protobuf for specifying an Appc container image. See:
+    // https://github.com/appc/spec/blob/master/spec/aci.md
+    message AppC {
+      // The name of the image.
+      required string name = 1;
+
+      // An image ID is a string of the format "hash-value", where "hash"
+      // is the hash algorithm used and "value" is the hex encoded string of
+      // the digest. Currently the only permitted hash algorithm is sha512.
+      required string id = 2;
+
+      // Optional labels. Suggested labels: "version", "os", and "arch".
+      optional Labels labels = 3;
+    }
+
+    required Type type = 1;
+    // Only one of the following image messages should be set to match
+    // the type.
+    optional AppC appc = 2;
+  }
+
+  message MesosInfo {
+    optional Image image = 1;
+  }
+
   required Type type = 1;
   repeated Volume volumes = 2;
   optional string hostname = 4;
 
+  // Only one of the following *Info messages should be set to match
+  // the type.
   optional DockerInfo docker = 3;
+  optional MesosInfo mesos = 5;
 }