code reformat, init fixes

app/modules/compose/compose.go

@@ -41,41 +41,41 @@ func CheckDockerComposeVersion() {
 }
 
 func MergeComposerFiles(filenames ...string) (string, error) {
-    var resultValues map[string]interface{}
+	var resultValues map[string]interface{}
 
 	if len(filenames) <= 0 {
-        return "", errors.New("You must provide at least one filename for reading Values")
-    }
+		return "", errors.New("You must provide at least one filename for reading Values")
+	}
 
-    for _, filename := range filenames {
+	for _, filename := range filenames {
 
-        var override map[string]interface{}
-        bs, err := ioutil.ReadFile(filename)
-        if err != nil {
-            log.Print(err)
-            continue
-        }
-        if err := yaml.Unmarshal(bs, &override); err != nil {
-            log.Print(err)
-            continue
-        }
+		var override map[string]interface{}
+		bs, err := ioutil.ReadFile(filename)
+		if err != nil {
+			log.Print(err)
+			continue
+		}
+		if err := yaml.Unmarshal(bs, &override); err != nil {
+			log.Print(err)
+			continue
+		}
 
-        if resultValues == nil {
-            resultValues = override
-        } else {
-            for k, v := range override {
-                resultValues[k] = v
-            }
-        }
-    }
+		if resultValues == nil {
+			resultValues = override
+		} else {
+			for k, v := range override {
+				resultValues[k] = v
+			}
+		}
+	}
 
-    bs, err := yaml.Marshal(resultValues)
-    if err != nil {
-        log.Fatal(err)
-        return "", err
-    }
+	bs, err := yaml.Marshal(resultValues)
+	if err != nil {
+		log.Fatal(err)
+		return "", err
+	}
 
-    return string(bs), nil
+	return string(bs), nil
 }
 
 func ShowDockerImageFQN(ctx *context.LedoContext) string {
@@ -107,7 +107,6 @@ func ExecComposerBuild(ctx *context.LedoContext) {
 	ctx.ExecCmd("docker-compose", args[0:])
 }
 
-
 func ExecComposerDown(ctx *context.LedoContext) {
 	args := ctx.ComposeArgs
 	args = append(args, "down")
@@ -166,7 +165,3 @@ func ExecComposerUpOnce(ctx *context.LedoContext) {
 	args = append(args, "up", "--force-recreate", "--renew-anon-volumes", "--abort-on-container-exit", "--exit-code-from", ctx.Config.Docker.MainService)
 	ctx.ExecCmd("docker-compose", args[0:])
 }
-
-
-
-

app/modules/compose/create_compose.go

@@ -0,0 +1,42 @@
+package compose
+
+import (
+	"html/template"
+	"ledo/app/helper"
+	"ledo/app/modules/context"
+	"ledo/app/templates"
+	"log"
+	"os"
+)
+
+func CreateComposeFile(ctx *context.LedoContext, dockerProject helper.DockerProjectCfg, composeMode string) error {
+	if _, err := os.Stat("./docker"); os.IsNotExist(err) {
+	    err := os.Mkdir("./docker", 0755)
+    	if err != nil {
+        	log.Fatal(err)
+    	}
+	}
+
+	log.Printf("%v", dockerProject)
+
+	templateName := templates.LedoDockerComposeBaseFileTemplate_base
+
+	tpl, err := template.New("dockercompose").Parse(templateName)
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	composeFilename := "./docker/docker-compose.yml"
+
+	if composeMode != "base" {
+		composeFilename = "./docker/docker-compose."+composeMode+".yml"
+	}
+
+	f, err := os.Create(composeFilename)
+	if err != nil {
+		log.Println("create file: ", err)
+	}
+	err = tpl.Execute(f, ctx)
+
+	return err
+}