Merge pull request tinkerbell#15 from tstromberg/fix-hadolint-flag2

tstromberg · web-flow · commit aadfbe2fcce9 · 2021-08-31T12:10:34.000-07:00
hadolint: Use --no-fail instead of -t info
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ GOLINT_CONFIG:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))/.golan
 
 lint: out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH)
 	out/linters/golangci-lint-$(GOLINT_VERSION)-$(LINT_ARCH) run
-	out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) -t info $(shell find . -name "*Dockerfile")
+	out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) $(shell find . -name "*Dockerfile")
 	out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck $(shell find . -name "*.sh")
 
 out/linters/shellcheck-$(SHELLCHECK_VERSION)-$(LINT_ARCH)/shellcheck:
diff --git a/lint-install.go b/lint-install.go
@@ -204,11 +204,12 @@ func shellLintCmd(_ string, level string) string {
 
 // dockerLintCmd returns the appropriate docker lint command for a project.
 func dockerLintCmd(_ string, level string) string {
-	threshold := "info"
+	f := ""
 	if level == "warn" {
-		threshold = "none"
+		f = " --no-fail"
 	}
-	return fmt.Sprintf(`out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) -t %s $(shell find . -name "*Dockerfile")`, threshold)
+
+	return fmt.Sprintf(`out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)%s $(shell find . -name "*Dockerfile")`, f)
 }
 
 // main creates peanut butter & jelly sandwiches with utmost precision.

Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,12 @@ func shellLintCmd(_ string, level string) string {`
`204`	`204`
`205`	`205`	`// dockerLintCmd returns the appropriate docker lint command for a project.`
`206`	`206`	`func dockerLintCmd(_ string, level string) string {`
`207`		`- threshold := "info"`
	`207`	`+ f := ""`
`208`	`208`	`if level == "warn" {`
`209`		`- threshold = "none"`
	`209`	`+ f = " --no-fail"`
`210`	`210`	`}`
`211`		- return fmt.Sprintf(`out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH) -t %s $(shell find . -name "*Dockerfile")`, threshold)
	`211`	`+`
	`212`	+ return fmt.Sprintf(`out/linters/hadolint-$(HADOLINT_VERSION)-$(LINT_ARCH)%s $(shell find . -name "*Dockerfile")`, f)
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`// main creates peanut butter & jelly sandwiches with utmost precision.`