Skip to content

(Fix): Change dockerfile regex to match re2 #999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2025
Merged

(Fix): Change dockerfile regex to match re2 #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
273570b
Revert "Ignore *.dockerignore files as they do not conform to the Doc…
TylerJang27 Apr 2, 2025
82a7f35
fix snapshots
TylerJang27 Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions linters/hadolint/test_data/hadolint_v2.10.0_CUSTOM.check.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/Dockerfile.empty",
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand All @@ -44,6 +53,15 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/nested/Dockerfile.debug",
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand Down Expand Up @@ -72,6 +90,16 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/Dockerfile.empty",
],
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand All @@ -92,6 +120,16 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/nested/Dockerfile.debug",
],
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand Down
38 changes: 38 additions & 0 deletions linters/hadolint/test_data/hadolint_v2.12.1-beta_CUSTOM.check.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/Dockerfile.empty",
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand All @@ -44,6 +53,15 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/nested/Dockerfile.debug",
],
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand Down Expand Up @@ -72,6 +90,16 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/Dockerfile.empty",
],
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand All @@ -92,6 +120,16 @@ exports[`Testing linter hadolint test CUSTOM 1`] = `
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
"linter": "hadolint",
"paths": [
"test_data/nested/Dockerfile.debug",
],
"upstream": true,
"verb": "TRUNK_VERB_CHECK",
},
{
"command": "lint",
"fileGroupName": "docker",
Expand Down
6 changes: 4 additions & 2 deletions linters/plugin.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ lint:
# ?: is a non-capturing group, so that the RE2 DFA is more memory efficient
# NOTE(Tyler): This is more strict than it realistically needs to be, but this partial match
# and the file extensions provide a general enough capture.
# Note that re2 does not support ?!, so this does not capture all correct cases.
- (?i)(?:^|/)Dockerfile\.(?!.*\.dockerignore$).+$
- (?i)(?:^|/)Dockerfile\..+$
filenames:
- dockerfile
- Dockerfile
Expand Down Expand Up @@ -707,3 +706,6 @@ lint:

- linters: [osv-scanner]
paths: ["**/go.sum"]

- linters: [checkov, hadolint, snyk, terrascan, trivy]
paths: ["**/*.dockerignore"]
Loading