Skip to content

Commit fde89b9

Browse files
author
gentele
committed
resolves #164
1 parent e414b94 commit fde89b9

1 file changed

Lines changed: 19 additions & 7 deletions

File tree

cmd/init.go

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
127127
createChart := cmd.flags.overwrite
128128

129129
if !cmd.flags.overwrite {
130-
_, dockerfileNotFound := os.Stat(cmd.chartGenerator.Path + "/Dockerfile")
131-
_, chartDirNotFound := os.Stat(cmd.chartGenerator.Path + "/chart")
130+
_, dockerfileNotFound := os.Stat(cmd.workdir + "/Dockerfile")
131+
_, chartDirNotFound := os.Stat(cmd.workdir + "/chart")
132132

133133
if dockerfileNotFound == nil || chartDirNotFound == nil {
134134
overwriteAnswer := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
@@ -266,6 +266,17 @@ func (cmd *InitCmd) addPortForwarding(port int) {
266266
}
267267

268268
func (cmd *InitCmd) addDefaultSyncConfig() {
269+
dockerignore, err := ioutil.ReadFile(cmd.workdir + "/.dockerignore")
270+
uploadExcludePaths := []string{}
271+
272+
if err != nil {
273+
dockerignoreRules := strings.Split(string(dockerignore), "\n")
274+
275+
for _, ignoreRule := range dockerignoreRules {
276+
uploadExcludePaths = append(uploadExcludePaths, ignoreRule)
277+
}
278+
}
279+
269280
for _, syncPath := range *cmd.config.DevSpace.Sync {
270281
if *syncPath.LocalSubPath == "./" || *syncPath.ContainerPath == "/app" {
271282
return
@@ -279,6 +290,7 @@ func (cmd *InitCmd) addDefaultSyncConfig() {
279290
LabelSelector: &map[string]*string{
280291
"release": cmd.config.DevSpace.Release.Name,
281292
},
293+
UploadExcludePaths: &uploadExcludePaths,
282294
})
283295
cmd.config.DevSpace.Sync = &syncConfig
284296
}
@@ -477,18 +489,18 @@ func (cmd *InitCmd) determineLanguage() {
477489
if len(cmd.chartGenerator.Language) == 0 {
478490
log.StartWait("Detecting programming language")
479491

480-
cmd.chartGenerator.Language, _ = cmd.chartGenerator.GetLanguage()
481492
supportedLanguages, err := cmd.chartGenerator.GetSupportedLanguages()
482493

494+
if err != nil {
495+
log.Fatalf("Unable to get supported languages: %s", err.Error())
496+
}
497+
cmd.chartGenerator.Language, _ = cmd.chartGenerator.GetLanguage()
498+
483499
if cmd.chartGenerator.Language == "" {
484500
cmd.chartGenerator.Language = "none"
485501
}
486502
log.StopWait()
487503

488-
if err != nil {
489-
log.Fatalf("Unable to get supported languages: %s", err.Error())
490-
}
491-
492504
cmd.chartGenerator.Language = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
493505
Question: "What is the major programming language of your project?\nSupported languages: " + strings.Join(supportedLanguages, ", "),
494506
DefaultValue: cmd.chartGenerator.Language,

0 commit comments

Comments
 (0)