Merge pull request moby#4990 from crazy-max/docs-dockerfile-gen

dockerfile: generate lint rules documentation

Author: tonistiigi

Makefile

@@ -113,6 +113,10 @@ doctoc:
 docs:
 	$(BUILDX_CMD) bake docs
 
+.PHONY: docs-dockerfile
+docs-dockerfile:
+	$(BUILDX_CMD) bake docs-dockerfile
+
 .PHONY: mod-outdated
 mod-outdated:
 	$(BUILDX_CMD) bake mod-outdated

docker-bake.hcl

@@ -126,7 +126,7 @@ target "integration-tests" {
 }
 
 group "validate" {
-  targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-archutil", "validate-shfmt", "validate-docs"]
+  targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-archutil", "validate-shfmt", "validate-docs", "validate-docs-dockerfile"]
 }
 
 target "lint" {
@@ -211,6 +211,13 @@ target "validate-docs" {
   output = ["type=cacheonly"]
 }
 
+target "validate-docs-dockerfile" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/docs-dockerfile.Dockerfile"
+  target = "validate"
+  output = ["type=cacheonly"]
+}
+
 target "vendor" {
   inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/vendor.Dockerfile"
@@ -260,6 +267,13 @@ target "docs" {
   output = ["./docs"]
 }
 
+target "docs-dockerfile" {
+  inherits = ["_common"]
+  dockerfile = "./hack/dockerfiles/docs-dockerfile.Dockerfile"
+  target = "update"
+  output = ["./frontend/dockerfile/docs/rules"]
+}
+
 target "mod-outdated" {
   inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/vendor.Dockerfile"

frontend/dockerfile/dockerfile2llb/convert.go

@@ -2164,8 +2164,8 @@ func validateCommandCasing(dockerfile *parser.Result, lint *linter.Linter) {
 		// as well as ensuring that the casing is consistent throughout the dockerfile by comparing the
 		// command to the casing of the majority of commands.
 		if !isSelfConsistentCasing(node.Value) {
-			msg := linter.RuleSelfConsistentCommandCasing.Format(node.Value)
-			lint.Run(&linter.RuleSelfConsistentCommandCasing, node.Location(), msg)
+			msg := linter.RuleConsistentInstructionCasing.Format(node.Value)
+			lint.Run(&linter.RuleConsistentInstructionCasing, node.Location(), msg)
 		} else {
 			var msg string
 			var needsLintWarn bool
@@ -2284,8 +2284,8 @@ func toPBLocation(sourceIndex int, location []parser.Range) pb.Location {
 func reportUnusedFromArgs(values []string, unmatched map[string]struct{}, location []parser.Range, lint *linter.Linter) {
 	for arg := range unmatched {
 		suggest, _ := suggest.Search(arg, values, true)
-		msg := linter.RuleUndeclaredArgInFrom.Format(arg, suggest)
-		lint.Run(&linter.RuleUndeclaredArgInFrom, location, msg)
+		msg := linter.RuleUndefinedArgInFrom.Format(arg, suggest)
+		lint.Run(&linter.RuleUndefinedArgInFrom, location, msg)
 	}
 }