Browse Source

fix(worker): keep the same working dir inside and outside of docker

bigeagle 8 years ago
parent
commit
d4e07a7b29
1 changed files with 4 additions and 7 deletions
  1. 4 7
      worker/docker.go

+ 4 - 7
worker/docker.go

@@ -32,6 +32,7 @@ func newDockerHook(p mirrorProvider, gCfg dockerConfig, mCfg mirrorConfig) *dock
 
 
 func (d *dockerHook) preExec() error {
 func (d *dockerHook) preExec() error {
 	p := d.provider
 	p := d.provider
+	logDir := p.LogDir()
 	logFile := p.LogFile()
 	logFile := p.LogFile()
 	workingDir := p.WorkingDir()
 	workingDir := p.WorkingDir()
 
 
@@ -42,17 +43,13 @@ func (d *dockerHook) preExec() error {
 		}
 		}
 	}
 	}
 
 
-	logFileNew := "/log_latest"
-	workingDirNew := "/data"
-
 	// Override workingDir
 	// Override workingDir
 	ctx := p.EnterContext()
 	ctx := p.EnterContext()
-	ctx.Set(_WorkingDirKey, workingDirNew)
-	ctx.Set(_LogFileKey+":docker", logFileNew)
 	ctx.Set(
 	ctx.Set(
 		"volumes", []string{
 		"volumes", []string{
-			fmt.Sprintf("%s:%s", logFile, logFileNew),
-			fmt.Sprintf("%s:%s", workingDir, workingDirNew),
+			fmt.Sprintf("%s:%s", logDir, logDir),
+			fmt.Sprintf("%s:%s", logFile, logFile),
+			fmt.Sprintf("%s:%s", workingDir, workingDir),
 		},
 		},
 	)
 	)
 	return nil
 	return nil