Repository: mesos Updated Branches: refs/heads/master ba234941c -> 39c385650
Added Docker Image type to Container Image for v1 API. Review: https://reviews.apache.org/r/40017 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/39c38565 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/39c38565 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/39c38565 Branch: refs/heads/master Commit: 39c3856502780e4bb891e527c4d5df7d7f95f024 Parents: ba23494 Author: Joerg Schad <[email protected]> Authored: Fri Nov 6 15:01:42 2015 -0800 Committer: Timothy Chen <[email protected]> Committed: Fri Nov 6 15:01:42 2015 -0800 ---------------------------------------------------------------------- include/mesos/v1/mesos.proto | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/39c38565/include/mesos/v1/mesos.proto ---------------------------------------------------------------------- diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto index 7b725d3..e71ddda 100644 --- a/include/mesos/v1/mesos.proto +++ b/include/mesos/v1/mesos.proto @@ -1282,6 +1282,7 @@ message RateLimits { message Image { enum Type { APPC = 1; + DOCKER = 2; } // Protobuf for specifying an Appc container image. See: @@ -1300,11 +1301,20 @@ message Image { optional Labels labels = 3; } + message Docker { + // The name of the image. Expected format: + // [REGISTRY_HOST[:REGISTRY_PORT]/]REPOSITORY[:TAG|@TYPE:DIGEST] + // + // See: https://docs.docker.com/reference/commandline/pull/ + 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; }
