Repository: mesos Updated Branches: refs/heads/master 851d5f0a1 -> b53c5d3a5
Added new ContainerLaunchInfo task_environment. Review: https://reviews.apache.org/r/58923/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c3130bd5 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c3130bd5 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c3130bd5 Branch: refs/heads/master Commit: c3130bd56d6a691da8c561e7acc739fe5fd87564 Parents: 851d5f0 Author: Till Toenshoff <[email protected]> Authored: Mon May 8 19:15:29 2017 +0200 Committer: Till Toenshoff <[email protected]> Committed: Mon May 8 19:15:29 2017 +0200 ---------------------------------------------------------------------- include/mesos/slave/containerizer.proto | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c3130bd5/include/mesos/slave/containerizer.proto ---------------------------------------------------------------------- diff --git a/include/mesos/slave/containerizer.proto b/include/mesos/slave/containerizer.proto index c30b1fc..41f2905 100644 --- a/include/mesos/slave/containerizer.proto +++ b/include/mesos/slave/containerizer.proto @@ -161,6 +161,8 @@ message ContainerLaunchInfo { // The additional preparation commands to execute before // executing the command. repeated CommandInfo pre_exec_commands = 1; + + // The environment set for the container. optional Environment environment = 2; // (Linux only) The root filesystem for the container. @@ -196,6 +198,12 @@ message ContainerLaunchInfo { // (POSIX only) The slave path of the pseudo terminal. optional string tty_slave_path = 14; + + // The environment specific for command tasks. Gets merged with + // 'environment' and the 'command' `Environment`. + // TODO(tillt): Remove this once we no longer support the old style + // command task (i.e., that uses mesos-execute). + optional Environment task_environment = 15; }
