From 553933514a82aa6e4bbbfac7198ec6d5f92b2e59 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Wed, 12 Aug 2020 16:06:19 -0700 Subject: [PATCH 1/2] fix use new run marker --- pkg/commands/run_marker.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/commands/run_marker.go b/pkg/commands/run_marker.go index 8d67160bf7..112fc7f07e 100644 --- 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 } From 9a12c6f88e21618c4bbb00b1ecb8dbb2443cde13 Mon Sep 17 00:00:00 2001 From: Tejal Desai Date: Wed, 12 Aug 2020 18:54:53 -0700 Subject: [PATCH 2/2] gofmt --- Makefile | 6 +++--- pkg/commands/run_marker.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0966fe693e..e57696af40 100644 --- 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 index 112fc7f07e..62dd83736d 100644 --- a/pkg/commands/run_marker.go +++ b/pkg/commands/run_marker.go @@ -59,7 +59,7 @@ func (r *RunMarkerCommand) ExecuteCommand(config *v1.Config, buildArgs *dockerfi isNewer := func(p string) (bool, error) { fi, err := os.Stat(p) if err != nil { - logrus.Warnf("error retrieving stat for file %s: %v", p,err) + logrus.Warnf("error retrieving stat for file %s: %v", p, err) return false, nil } return fi.ModTime().After(markerInfo.ModTime()), nil