You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/24 01:24:45 UTC
mesos git commit: Fixed chdir to an empty directory error in docker
runtime isolator.
Repository: mesos
Updated Branches:
refs/heads/master 41343a7a6 -> eaa9f14a7
Fixed chdir to an empty directory error in docker runtime isolator.
Review: https://reviews.apache.org/r/43854/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/eaa9f14a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/eaa9f14a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/eaa9f14a
Branch: refs/heads/master
Commit: eaa9f14a7aa3f5e913641b52cb7cd9da2c0846e4
Parents: 41343a7
Author: Gilbert Song <so...@gmail.com>
Authored: Tue Feb 23 16:24:17 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue Feb 23 16:24:17 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/isolators/docker/runtime.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/eaa9f14a/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 1bb5e28..4241f4c 100644
--- a/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
+++ b/src/slave/containerizer/mesos/isolators/docker/runtime.cpp
@@ -349,7 +349,10 @@ Option<string> DockerRuntimeIsolatorProcess::getWorkingDirectory(
{
CHECK(containerConfig.docker().manifest().has_config());
- if (!containerConfig.docker().manifest().config().has_workingdir()) {
+ // NOTE: In docker manifest, if an image working directory is none,
+ // it will be set as `"WorkingDir": ""`.
+ if (!containerConfig.docker().manifest().config().has_workingdir() ||
+ containerConfig.docker().manifest().config().workingdir() == "") {
return None();
}