[ARVADOS] updated: 35dde4022e317536642646366ff01578bf904fb6

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

       via  35dde4022e317536642646366ff01578bf904fb6 (commit)
      from  43d1a5d0b9272f6e57a3d0afd59b956054ff4d7a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 35dde4022e317536642646366ff01578bf904fb6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 3 09:52:41 2017 -0400

    11469: All {kind: tmp} mounts set up under host tempdir, don't try to use
    Docker volumes.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index d1c24a5..c6847bc 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -430,24 +430,25 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 			}
 			collectionPaths = append(collectionPaths, src)
 
-		case mnt.Kind == "tmp" && bind == runner.Container.OutputPath:
-			runner.HostOutputDir, err = runner.MkTempDir("", "")
+		case mnt.Kind == "tmp":
+			var tmpdir string
+			tmpdir, err = runner.MkTempDir("", "")
 			if err != nil {
 				return fmt.Errorf("While creating mount temp dir: %v", err)
 			}
-			st, staterr := os.Stat(runner.HostOutputDir)
+			st, staterr := os.Stat(tmpdir)
 			if staterr != nil {
 				return fmt.Errorf("While Stat on temp dir: %v", staterr)
 			}
-			err = os.Chmod(runner.HostOutputDir, st.Mode()|os.ModeSetgid|0777)
+			err = os.Chmod(tmpdir, st.Mode()|os.ModeSetgid|0777)
 			if staterr != nil {
 				return fmt.Errorf("While Chmod temp dir: %v", err)
 			}
-			runner.CleanupTempDir = append(runner.CleanupTempDir, runner.HostOutputDir)
-			runner.Binds = append(runner.Binds, fmt.Sprintf("%s:%s", runner.HostOutputDir, bind))
-
-		case mnt.Kind == "tmp":
-			runner.Volumes[bind] = struct{}{}
+			runner.CleanupTempDir = append(runner.CleanupTempDir, tmpdir)
+			runner.Binds = append(runner.Binds, fmt.Sprintf("%s:%s", tmpdir, bind))
+			if bind == runner.Container.OutputPath {
+				runner.HostOutputDir = tmpdir
+			}
 
 		case mnt.Kind == "json":
 			jsondata, err := json.Marshal(mnt.Content)

-----------------------------------------------------------------------


hooks/post-receive
--