public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1379 from tejal29/fix_use_new_run 

fix use new run marker
This commit is contained in:
Tejal Desai 2020-08-13 09:46:20 -07:00 committed by GitHub
parent c480a06347 9a12c6f88e
commit 4ec9f206c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -88,9 +88,9 @@ integration-test-misc:
.PHONY: images .PHONY: images
images: images:
docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:latest -f deploy/Dockerfile . docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:latest-1317 -f deploy/Dockerfile .
docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug . docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:debug-1317 -f deploy/Dockerfile_debug .
docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer . docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/warmer:latest-1317 -f deploy/Dockerfile_warmer .
.PHONY: push .PHONY: push
push: push:

3
pkg/commands/run_marker.go
View File

@ -59,7 +59,8 @@ func (r *RunMarkerCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfi
isNewer := func(p string) (bool, error) { isNewer := func(p string) (bool, error) {
fi, err := os.Stat(p) fi, err := os.Stat(p)
if err != nil { if err != nil {
return false, err logrus.Warnf("error retrieving stat for file %s: %v", p, err)
return false, nil
} }
return fi.ModTime().After(markerInfo.ModTime()), nil return fi.ModTime().After(markerInfo.ModTime()), nil
} }