Repository: mesos Updated Branches: refs/heads/master da37f81ba -> ed4cec8f4
Add Docker Image type to Container Image protobuf. Review: https://reviews.apache.org/r/37196 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ed4cec8f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ed4cec8f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ed4cec8f Branch: refs/heads/master Commit: ed4cec8f474e341e01768da0133a75609e40d1f7 Parents: da37f81 Author: Lily Chen <[email protected]> Authored: Mon Aug 10 15:33:34 2015 -0700 Committer: Timothy Chen <[email protected]> Committed: Mon Aug 10 15:33:34 2015 -0700 ---------------------------------------------------------------------- include/mesos/mesos.proto | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ed4cec8f/include/mesos/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto index 80f56ac..913bcbf 100644 --- a/include/mesos/mesos.proto +++ b/include/mesos/mesos.proto @@ -1197,6 +1197,7 @@ message RateLimits { message Image { enum Type { APPC = 1; + DOCKER = 2; } // Protobuf for specifying an Appc container image. See: @@ -1215,11 +1216,17 @@ message Image { optional Labels labels = 3; } + message Docker { + // The name of the image. Expected in format repository[:tag]. + required string name = 1; + } + required Type type = 1; // Only one of the following image messages should be set to match // the type. optional AppC appc = 2; + optional Docker docker = 3; }
