Merge branch 'refactor/volume' into 'master'

remove old $APPNAME/permdir, and handles empty config.PermDir See merge request !77
projecteru2 · Apr 6, 2017 · 232f99d · 232f99d
2 parents 50fca21 + 43e12a7
commit 232f99d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/cluster/calcium/build_image.go b/cluster/calcium/build_image.go
@@ -24,7 +24,6 @@ echo 32768 > /writable-proc/sys/net/core/somaxconn
 echo 1 > /writable-proc/sys/vm/overcommit_memory
 chmod 777 /dev/stdout
 chmod 777 /dev/stderr
-if [ -d {{.Appdir}}/{{.Appname}}/permdir ]; then chown {{.UID}} {{.Appdir}}/{{.Appname}}/permdir; fi
 
 neednetwork=$1
 if [ $neednetwork = "network" ]; then

diff --git a/cluster/calcium/create_container.go b/cluster/calcium/create_container.go
@@ -555,8 +555,10 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
 	env = append(env, fmt.Sprintf("ERU_NODE_IP=%s", nodeIP))
 	env = append(env, fmt.Sprintf("ERU_NODE_NAME=%s", node.Name))
 	env = append(env, fmt.Sprintf("ERU_ZONE=%s", c.config.Zone))
-	env = append(env, fmt.Sprintf("PERMDIR=%s", filepath.Join(c.config.PermDir, specs.Appname)))
 	env = append(env, fmt.Sprintf("APPDIR=%s", filepath.Join(c.config.AppDir, specs.Appname)))
+	if c.config.PermDir != "" {
+		env = append(env, fmt.Sprintf("PERMDIR=%s", filepath.Join(c.config.PermDir, specs.Appname)))
+	}
 
 	// mount paths
 	binds, volumes := makeMountPaths(specs, c.config)

diff --git a/cluster/calcium/helper.go b/cluster/calcium/helper.go
@@ -79,7 +79,9 @@ func makeMountPaths(specs types.Specs, config types.Config) ([]string, map[strin
 
 	var expandENV = func(env string) string {
 		envMap := make(map[string]string)
-		envMap["PERMDIR"] = filepath.Join(config.PermDir, specs.Appname)
+		if config.PermDir != "" {
+			envMap["PERMDIR"] = filepath.Join(config.PermDir, specs.Appname)
+		}
 		envMap["APPDIR"] = filepath.Join(config.AppDir, specs.Appname)
 		return envMap[env]
 	}