Merge pull request #136 from ZupIT/feature/updateDockerfiles

[FEATURE] update templates
ZupIT · Jun 2, 2020 · 2f9ccb5 · 2f9ccb5
2 parents 1cadf09 + ecbc1f0
commit 2f9ccb5
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 14 deletions.
diff --git a/pkg/cmd/create_formula.go b/pkg/cmd/create_formula.go
@@ -88,8 +88,8 @@ func (c createFormulaCmd) runPrompt() CommandRunnerFunc {
 			return err
 		}
 
-		fmt.Printf("Formula in %s successfully created!\n", lang)
-		fmt.Printf("Your formula is in %s", f.FormPath)
+		fmt.Printf("%s formula successfully created!\n", lang)
+		fmt.Printf("Formula path is %s \n", f.FormPath)
 
 		return nil
 	}
@@ -115,8 +115,8 @@ func (c createFormulaCmd) runStdin() CommandRunnerFunc {
 			return err
 		}
 
-		fmt.Printf("Formula in %s successfully created!\n", cf.Lang)
-		fmt.Printf("Your formula is in %s\n", f.FormPath)
+		fmt.Printf("%s formula successfully created!\n", cf.Lang)
+		fmt.Printf("Formula path is %s \n", f.FormPath)
 
 		return nil
 	}

diff --git a/pkg/formula/creator.go b/pkg/formula/creator.go
@@ -14,6 +14,7 @@ import (
 	"github.com/ZupIT/ritchie-cli/pkg/api"
 	"github.com/ZupIT/ritchie-cli/pkg/file/fileutil"
 	"github.com/ZupIT/ritchie-cli/pkg/formula/tpl/tpl_go"
+	"github.com/ZupIT/ritchie-cli/pkg/formula/tpl/tpl_shell"
 )
 
 var ErrMakefileNotFound = errors.New("makefile not found")
@@ -278,6 +279,9 @@ func createGenericFiles(srcDir, pkg, dir string, l Lang) error {
 	if err != nil {
 		return err
 	}
+	if err := createUmask(srcDir); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -304,6 +308,11 @@ func createDockerfile(dir, tpl string) error {
 	return fileutil.WriteFile(fmt.Sprintf("%s/Dockerfile", dir), []byte(tpl))
 }
 
+func createUmask(dir string) error {
+	uMaskFile := fmt.Sprintf("%s/set_umask.sh", dir)
+	return fileutil.WriteFile(uMaskFile, []byte(tpl_shell.Umask))
+}
+
 func createGoModFile(dir, pkg string) error {
 	tplFile := tpl_go.GoMod
 	tplFile = strings.ReplaceAll(tplFile, nameModule, pkg)

diff --git a/pkg/formula/tpl/tpl_go/tpl_go.go b/pkg/formula/tpl/tpl_go/tpl_go.go
@@ -141,14 +141,22 @@ test:
 
 	Dockerfile = `
 FROM golang:alpine AS builder
-WORKDIR /app/
-COPY . .
+
+ADD . /app
+WORKDIR /app
 RUN go build -o main -v main.go
 
-FROM alpine:latest  
-WORKDIR /app/
-COPY --from=builder app/main .
-ENTRYPOINT ["./main"]`
+FROM alpine:latest
+
+
+COPY --from=builder /app/main main
+COPY --from=builder /app/set_umask.sh set_umask.sh
+RUN chmod +x main
+RUN chmod +x set_umask.sh
+
+WORKDIR /app
+ENTRYPOINT ["/set_umask.sh"]
+CMD ["/main"]`
 
 	MakefileMain = `#Makefiles
 {{formName}}={{formPath}}

diff --git a/pkg/formula/tpl/tpl_java/tpl_java.go b/pkg/formula/tpl/tpl_java/tpl_java.go
@@ -46,7 +46,11 @@ RUN apk add openjdk8
 ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk
 ENV PATH="$JAVA_HOME/bin:${PATH}"
 
-ENTRYPOINT java -jar Main.jar`
+RUN javac Main.java
+RUN chmod +x set_umask.sh
+
+ENTRYPOINT ["/app/set_umask.sh"]
+CMD ["java Main"]`
 
 	Run = `#!/bin/sh
 java -jar Main.jar`

diff --git a/pkg/formula/tpl/tpl_node/tpl_node.go b/pkg/formula/tpl/tpl_node/tpl_node.go
@@ -31,7 +31,9 @@ WORKDIR /app
 
 COPY . .
 
-ENTRYPOINT node index.js`
+RUN chmod +x set_umask.sh
+ENTRYPOINT ["/app/set_umask.sh"]
+CMD ["node index.js"]`
 
 	Run = `#!/bin/sh
 node index.js`

diff --git a/pkg/formula/tpl/tpl_python/tpl_python.go b/pkg/formula/tpl/tpl_python/tpl_python.go
@@ -30,7 +30,10 @@ WORKDIR /app
 
 COPY . .
 
-ENTRYPOINT python3 main.py`
+RUN chmod +x set_umask.sh
+
+ENTRYPOINT ["/app/set_umask.sh"]
+CMD ["python3 main.py"]`
 
 	File = `#!/usr/bin/python3
 import time

diff --git a/pkg/formula/tpl/tpl_shell/tpl_shell.go b/pkg/formula/tpl/tpl_shell/tpl_shell.go
@@ -24,8 +24,14 @@ WORKDIR /app
 COPY . .
 
 RUN chmod +x main.sh
+RUN chmod +x set_umask.sh
 
-ENTRYPOINT /app/main.sh`
+ENTRYPOINT ["/app/set_umask.sh"]
+CMD ["./main.sh"]`
+
+	Umask = `#!/bin/sh
+umask 0011
+$1`
 
 	File = `#!/bin/sh
 run() {