Repository: mesos Updated Branches: refs/heads/master 45363984c -> d69b10156
Fix duplicate "-e" environment variables option in Docker::run. Review: https://reviews.apache.org/r/36179 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d69b1015 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d69b1015 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d69b1015 Branch: refs/heads/master Commit: d69b101563a413e0a346eeec2780b6ce26d775df Parents: 4536398 Author: haosdent huang <[email protected]> Authored: Sat Jul 4 10:37:30 2015 -0700 Committer: Timothy Chen <[email protected]> Committed: Sat Jul 4 20:55:53 2015 -0700 ---------------------------------------------------------------------- src/docker/docker.cpp | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d69b1015/src/docker/docker.cpp ---------------------------------------------------------------------- diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp index 235ac4a..2793258 100644 --- a/src/docker/docker.cpp +++ b/src/docker/docker.cpp @@ -369,6 +369,11 @@ Future<Nothing> Docker::run( foreach (const Environment::Variable& variable, commandInfo.environment().variables()) { + if (env.isSome() && + env.get().find(variable.name()) != env.get().end()) { + // Skip to avoid duplicate environment variables. + continue; + } argv.push_back("-e"); argv.push_back(variable.name() + "=" + variable.value()); }
