Skip to content

Fixes #336 #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 31, 2018
Merged

Fixes #336 #337

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions pkg/devspace/image/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
}
}

dockerfilePath, err := filepath.Abs(dockerfilePath)
absoluteDockerfilePath, err := filepath.Abs(dockerfilePath)
if err != nil {
return false, fmt.Errorf("Couldn't determine absolute path for %s", *imageConf.Build.DockerfilePath)
}
Expand Down Expand Up @@ -201,7 +201,7 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
}
}

err = imageBuilder.BuildImage(contextPath, dockerfilePath, buildOptions)
err = imageBuilder.BuildImage(contextPath, absoluteDockerfilePath, buildOptions)
if err != nil {
return false, fmt.Errorf("Error during image build: %v", err)
}
Expand Down Expand Up @@ -231,9 +231,6 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
func shouldRebuild(runtimeConfig *generated.Config, imageConf *v1.ImageConfig, dockerfilePath string, forceRebuild bool) bool {
mustRebuild := true

cwd, _ := os.Getwd()
relativeDockerfilePath := dockerfilePath[len(cwd):]

dockerfileInfo, err := os.Stat(dockerfilePath)
if err != nil {
log.Warnf("Dockerfile %s missing: %v", dockerfilePath, err)
Expand All @@ -242,10 +239,10 @@ func shouldRebuild(runtimeConfig *generated.Config, imageConf *v1.ImageConfig, d
// When user has not used -b or --build flags
if forceRebuild == false {
// only rebuild Docker image when Dockerfile has changed since latest build
mustRebuild = dockerfileInfo.ModTime().Unix() != runtimeConfig.DockerLatestTimestamps[relativeDockerfilePath]
mustRebuild = dockerfileInfo.ModTime().Unix() != runtimeConfig.DockerLatestTimestamps[dockerfilePath]
}

runtimeConfig.DockerLatestTimestamps[relativeDockerfilePath] = dockerfileInfo.ModTime().Unix()
runtimeConfig.DockerLatestTimestamps[dockerfilePath] = dockerfileInfo.ModTime().Unix()
}

return mustRebuild
Expand Down