Updated runtime isolators to use new task_environment member. Review: https://reviews.apache.org/r/58925/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b53c5d3a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b53c5d3a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b53c5d3a Branch: refs/heads/master Commit: b53c5d3a598f0b7bf6fa7eda1f35dee0db00e082 Parents: 1973ab5 Author: Till Toenshoff <[email protected]> Authored: Mon May 8 19:16:54 2017 +0200 Committer: Till Toenshoff <[email protected]> Committed: Mon May 8 19:16:54 2017 +0200 ---------------------------------------------------------------------- src/slave/containerizer/mesos/isolators/appc/runtime.cpp | 4 +--- src/slave/containerizer/mesos/isolators/docker/runtime.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b53c5d3a/src/slave/containerizer/mesos/isolators/appc/runtime.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/appc/runtime.cpp b/src/slave/containerizer/mesos/isolators/appc/runtime.cpp index ffaec5a..f76b22b 100644 --- a/src/slave/containerizer/mesos/isolators/appc/runtime.cpp +++ b/src/slave/containerizer/mesos/isolators/appc/runtime.cpp @@ -116,9 +116,7 @@ Future<Option<ContainerLaunchInfo>> AppcRuntimeIsolatorProcess::prepare( CommandInfo executorCommand = containerConfig.executor_info().command(); if (environment.isSome()) { - executorCommand.add_arguments( - "--task_environment=" + - stringify(JSON::protobuf(environment.get()))); + launchInfo.mutable_task_environment()->CopyFrom(environment.get()); } // Pass working directory to command executor as a flag. http://git-wip-us.apache.org/repos/asf/mesos/blob/b53c5d3a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp index 08350e6..2a6e0b1 100644 --- a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp +++ b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp @@ -136,9 +136,7 @@ Future<Option<ContainerLaunchInfo>> DockerRuntimeIsolatorProcess::prepare( CommandInfo executorCommand = containerConfig.executor_info().command(); if (environment.isSome()) { - executorCommand.add_arguments( - "--task_environment=" + - stringify(JSON::protobuf(environment.get()))); + launchInfo.mutable_task_environment()->CopyFrom(environment.get()); } // Pass working directory to command executor as a flag.
