Merge pull request #1379 from tejal29/fix_use_new_run

fix use new run marker
GoogleContainerTools · Aug 13, 2020 · 4ec9f20 · 4ec9f20
2 parents c480a06 + 9a12c6f
commit 4ec9f20
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -88,9 +88,9 @@ integration-test-misc:
 
 .PHONY: 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:debug -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)/executor:latest-1317 -f deploy/Dockerfile .
+	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-1317 -f deploy/Dockerfile_warmer .
 
 .PHONY: push
 push:

diff --git a/pkg/commands/run_marker.go b/pkg/commands/run_marker.go
@@ -59,7 +59,8 @@ func (r *RunMarkerCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfi
 	isNewer := func(p string) (bool, error) {
 		fi, err := os.Stat(p)
 		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
 	}