You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/03 00:03:44 UTC
mesos git commit: Added Secret to Image::Docker in v1/mesos.proto.
Repository: mesos
Updated Branches:
refs/heads/master 7db801c52 -> 67d55a298
Added Secret to Image::Docker in v1/mesos.proto.
This is a followup patch for https://reviews.apache.org/r/58775/.
Review: https://reviews.apache.org/r/58880/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/67d55a29
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/67d55a29
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/67d55a29
Branch: refs/heads/master
Commit: 67d55a298c19c7deca47dbc84c7ae1dbb89796e2
Parents: 7db801c
Author: Gilbert Song <so...@gmail.com>
Authored: Tue May 2 16:59:54 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue May 2 17:00:00 2017 -0700
----------------------------------------------------------------------
include/mesos/v1/mesos.proto | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/67d55a29/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index ef562a2..c7f0bec 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -2130,7 +2130,18 @@ message Image {
// Credential to authenticate with docker registry.
// NOTE: This is not encrypted, therefore framework and operators
// should enable SSL when passing this information.
- optional Credential credential = 2;
+ //
+ // This is field is never used in Mesos before and is deprecated
+ // since Mesos 1.3. Please use the `Secret::Value` field `config`
+ // below (see MESOS-7088 for details).
+ optional Credential credential = 2 [deprecated = true]; // Since 1.3.
+
+ // The UTF-8 character encoded byte data, which is expected as
+ // a docker config file in JSON format. This field is used for
+ // supporting docker private registry credential per container.
+ // Users can specify different docker config files for pulling
+ // their private images from different registries.
+ optional Secret config = 3;
}
required Type type = 1;