Skip to content

Commit 175409e

Browse files
committed
dockerfile: promote experimental linter rules
This promotes the following linter rules: - CopyIgnoredFile - InvalidDefinitionDescription Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
1 parent a8e548f commit 175409e

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

frontend/dockerfile/dockerfile_lint_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var lintTests = integration.TestFuncs(
5454
)
5555

5656
func testDefinitionDescription(t *testing.T, sb integration.Sandbox) {
57-
dockerfile := []byte(`# check=experimental=InvalidDefinitionDescription
57+
dockerfile := []byte(`
5858
# foo this is the foo
5959
ARG foo=bar
6060
@@ -74,7 +74,7 @@ COPY Dockerfile .
7474
`)
7575
checkLinterWarnings(t, sb, &lintTestParams{Dockerfile: dockerfile})
7676

77-
dockerfile = []byte(`# check=experimental=InvalidDefinitionDescription
77+
dockerfile = []byte(`
7878
# bar this is the bar
7979
ARG foo=bar
8080
# BasE this is the BasE image
@@ -139,7 +139,7 @@ ADD Dockerfile /windy
139139
StreamBuildErrRegexp: regexp.MustCompile(`failed to solve: failed to compute cache key: failed to calculate checksum of ref [^\s]+ "/Dockerfile": not found`),
140140
})
141141

142-
dockerfile = []byte(`# check=experimental=CopyIgnoredFile
142+
dockerfile = []byte(`
143143
FROM scratch
144144
COPY Dockerfile .
145145
ADD Dockerfile /windy
@@ -170,7 +170,7 @@ ADD Dockerfile /windy
170170
},
171171
})
172172

173-
dockerfile = []byte(`# check=skip=all;experimental=CopyIgnoredFile
173+
dockerfile = []byte(`
174174
FROM scratch
175175
COPY Dockerfile .
176176
ADD Dockerfile /windy

frontend/dockerfile/linter/ruleset.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ var (
163163
Format: func(cmd, file string) string {
164164
return fmt.Sprintf("Attempting to %s file %q that is excluded by .dockerignore", cmd, file)
165165
},
166-
Experimental: true,
167166
}
168167
RuleInvalidDefinitionDescription = LinterRule[func(string, string) string]{
169168
Name: "InvalidDefinitionDescription",
@@ -172,7 +171,6 @@ var (
172171
Format: func(instruction, defName string) string {
173172
return fmt.Sprintf("Comment for %s should follow the format: `# %s <description>`", instruction, defName)
174173
},
175-
Experimental: true,
176174
}
177175
RuleExposeProtoCasing = LinterRule[func(string) string]{
178176
Name: "ExposeProtoCasing",

0 commit comments

Comments
 (0)