Added templating for docker-compose

Author: mihailistov

cmd/generate.go

@@ -48,6 +48,7 @@ var generateCmd = &cobra.Command{
 			proto.Generate(Templator, cfg)
 			golang.Generate(Templator, cfg)
 			docker.GenerateGoAppDockerFile(Templator, cfg)
+			docker.GenerateGoDockerCompose(Templator, cfg)
 		case React:
 			react.Generate(Templator, cfg)
 		}

example/hello-world/docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3.7"
+
+services:
+  app:
+    build: 
+      context: .
+      dockerfile: docker/app/Dockerfile
+    ports:
+      - "3000:3000"
+  http:
+    build:  
+      context: .
+      dockerfile: docker/http/Dockerfile
+    environment:
+      - APP_HOST=app
+      - APP_PORT=3000
+    ports:
+      - "8080:8080"

generate/docker/generate.go

@@ -14,3 +14,7 @@ func GenerateGoAppDockerFile(templator *templator.Templator, config *config.Comm
 func GenerateGoHttpGWDockerFile(templator *templator.Templator, config *config.Commit0Config) {
 	util.TemplateFileIfDoesNotExist("docker/http", "Dockerfile", templator.Docker.HttpGatewayDocker, config)
 }
+
+func GenerateGoDockerCompose(templator *templator.Templator, config *config.Commit0Config) {
+	util.TemplateFileIfDoesNotExist("", "docker-compose.yml", templator.Docker.DockerCompose, config)
+}

templates/docker/dockercompose.tmpl

@@ -0,0 +1,20 @@
+version: "3.7"
+
+services:
+  app:
+    build: 
+      context: .
+      dockerfile: docker/app/Dockerfile
+    ports:
+      - "{{ .Network.Grpc.Port }}:{{ .Network.Grpc.Port }}"
+  {{ if .Network.Http.Enabled }}
+  http:
+    build:
+      context: .
+      dockerfile: docker/http/Dockerfile
+    environment:
+      - APP_HOST=app
+      - APP_PORT={{ .Network.Grpc.Port }}
+    ports:
+      - "{{ .Network.Http.Port }}:{{ .Network.Http.Port }}"
+  {{- end}}

templator/templator.go

@@ -15,6 +15,7 @@ type DockerTemplator struct {
 	ApplicationDocker *template.Template
 	HttpGatewayDocker *template.Template
 	DockerIgnore      *template.Template
+	DockerCompose     *template.Template
 }
 
 type GoTemplator struct {
@@ -112,10 +113,14 @@ func NewDockerFileTemplator(box *packr.Box) *DockerTemplator {
 	ignoreTemplateSource, _ := box.FindString("docker/dockerignore.tmpl")
 	ignoreTemplate, _ := template.New("Dockerignore").Parse(ignoreTemplateSource)
 
+	composeTemplateSource, _ := box.FindString("docker/dockercompose.tmpl")
+	composeTemplate, _ := template.New("Dockercompose").Parse(composeTemplateSource)
+
 	return &DockerTemplator{
 		ApplicationDocker: appTemplate,
 		HttpGatewayDocker: httpTemplate,
 		DockerIgnore:      ignoreTemplate,
+		DockerCompose:     composeTemplate,
 	}
 }
 

util/util.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"path"
 	"strings"
 	"text/template"
 )
@@ -42,12 +43,14 @@ func TemplateFileAndOverwrite(fileDir string, fileName string, template *templat
 }
 
 func TemplateFileIfDoesNotExist(fileDir string, fileName string, template *template.Template, data interface{}) {
-	fullFilePath := fmt.Sprintf("%v/%v", fileDir, fileName)
+	fullFilePath := path.Join(fileDir, fileName)
 
 	if _, err := os.Stat(fullFilePath); os.IsNotExist(err) {
-		err := CreateDirIfDoesNotExist(fileDir)
-		if err != nil {
-			log.Printf("Error creating directory %v: %v", fullFilePath, err)
+		if (fileDir != "") {
+			err := CreateDirIfDoesNotExist(fileDir)
+			if err != nil {
+				log.Printf("Error creating directory %v: %v", fullFilePath, err)
+			}
 		}
 		createTemplatedFile(fullFilePath, template, data)
 	} else {