resolve #57

Author: gentele

cmd/init.go

@@ -140,7 +140,7 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 			},
 		},
 	})
-	cmd.overwriteConfig = configutil.GetOverwriteConfig()
+	cmd.overwriteConfig = configutil.GetOverwriteConfig(false)
 
 	imageMap := *cmd.config.Images
 	cmd.defaultImage, _ = imageMap["default"]

cmd/up.go

@@ -256,7 +256,7 @@ func (cmd *UpCmd) shouldRebuild(imageConf *v1.ImageConfig, dockerfilePath string
 // returns true when one of the images had to be rebuild
 func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 	re := false
-	config := configutil.GetConfig(true)
+	config := configutil.GetConfig(false)
 
 	for imageName, imageConf := range *config.Images {
 		dockerfilePath := "./Dockerfile"
@@ -317,7 +317,9 @@ func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 					if registryConf.Auth.Password != nil {
 						password = *registryConf.Auth.Password
 					}
+					log.StartWait("Authenticating (" + *registryConf.URL + ")")
 					buildErr = dockerBuilder.Authenticate(username, password, len(username) == 0)
+					log.StopWait()
 
 					if buildErr == nil {
 						buildOptions := &types.ImageBuildOptions{}
@@ -327,10 +329,14 @@ func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 								buildOptions.BuildArgs = *imageConf.Build.Engine.Docker.Options.BuildArgs
 							}
 						}
+						log.StartWait("Building Docker image")
 						buildErr = dockerBuilder.BuildImage(contextPath, dockerfilePath, buildOptions)
+						log.StopWait()
 
 						if buildErr == nil {
+							log.StartWait("Pushing Docker image")
 							buildErr = dockerBuilder.PushImage()
+							log.StopWait()
 						}
 					}
 				}

pkg/devspace/config/configutil/get.go

@@ -46,14 +46,18 @@ func ConfigExists() (bool, error) {
 //GetConfig returns the config merged from .devspace/config.yaml and .devspace/overwrite.yaml
 func GetConfig(reload bool) *v1.Config {
 	if !configLoaded || reload {
+		if reload {
+			config = makeConfig()
+			configRaw = makeConfig()
+		}
 		configLoaded = true
 
 		err := loadConfig(configRaw, configPath)
 
 		if err != nil {
 			log.Fatal("Unable to load config.")
 		}
-		GetOverwriteConfig()
+		GetOverwriteConfig(false)
 
 		merge(config, configRaw, unsafe.Pointer(&config), unsafe.Pointer(configRaw))
 		merge(config, overwriteConfig, unsafe.Pointer(&config), unsafe.Pointer(overwriteConfig))
@@ -66,8 +70,12 @@ func GetConfig(reload bool) *v1.Config {
 }
 
 //GetOverwriteConfig returns the config retrieved from .devspace/overwrite.yaml
-func GetOverwriteConfig() *v1.Config {
-	if !overwriteConfigLoaded {
+func GetOverwriteConfig(reload bool) *v1.Config {
+	if !overwriteConfigLoaded || reload {
+		if reload {
+			overwriteConfig = makeConfig()
+			overwriteConfigRaw = makeConfig()
+		}
 		overwriteConfigLoaded = true
 
 		//ignore error as overwrite.yaml is optional

pkg/devspace/config/v1/image.go

@@ -13,7 +13,7 @@ type BuildConfig struct {
 	ContextPath     *string      `yaml:"contextPath"`
 	DockerfilePath  *string      `yaml:"dockerfilePath"`
 	Engine          *BuildEngine `yaml:"engine"`
-	LatestTimestamp *string      `yaml:"latestTime"`
+	LatestTimestamp *string      `yaml:"latestTimestamp"`
 }
 
 //BuildEngine defines which build engine to use