hadolint 2.5.0 → 2.6.0

raw patch · 6 files changed

+21/−7 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• app/Main.hs +2/−2
• hadolint.cabal +1/−1
• src/Hadolint/Formatter/SonarQube.hs +1/−1
• src/Hadolint/Rule/DL3018.hs +12/−2
• src/Hadolint/Rule/DL3047.hs +1/−1
• test/DL3018.hs +4/−0

@@ -147,10 +147,10 @@         ( long "format"             <> short 'f' -- options for the output format             <> help-              "The output format for the results [tty | json | checkstyle | codeclimate | gitlab_codeclimate | codacy]"+              "The output format for the results [tty | json | checkstyle | codeclimate | gitlab_codeclimate | codacy | sonarqube]"             <> value Hadolint.TTY             <> showDefaultWith showFormat -- The default value-            <> completeWith ["tty", "json", "checkstyle", "codeclimate", "gitlab_codeclimate", "codacy"]+            <> completeWith ["tty", "json", "checkstyle", "codeclimate", "gitlab_codeclimate", "codacy", "sonarqube"]         )      errorList =

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           hadolint-version:        2.5.0+version:        2.6.0 synopsis:       Dockerfile Linter JavaScript API description:    A smarter Dockerfile linter that helps you build best practice Docker images. category:       Development

@@ -49,7 +49,7 @@             "textRange" .= object               [ "startLine" .= line,                 "endLine" .= line,-                "startColumn" .= (1 :: Int),+                "startColumn" .= (0 :: Int),                 "endColumn" .= (1 :: Int)               ]           ]

@@ -12,10 +12,20 @@     code = "DL3018"     severity = DLWarningC     message =-      "Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`"-    check (Run (RunArgs args _)) = foldArguments (\as -> and [versionFixed p | p <- apkAddPackages as]) args+      "Pin versions in apk add. Instead of `apk add <package>` \+      \use `apk add <package>=<version>`"+    check (Run (RunArgs args _)) =+      foldArguments+        ( \as ->+            and+              [ versionFixed p || packageFile p+                | p <- apkAddPackages as+              ]+        )+        args     check _ = True     versionFixed package = "=" `Text.isInfixOf` package+    packageFile package = ".apk" `Text.isSuffixOf` package {-# INLINEABLE rule #-}  apkAddPackages :: ParsedShell -> [Text.Text]

@@ -9,7 +9,7 @@ rule = simpleRule code severity message check   where     code = "DL3047"-    severity = DLWarningC+    severity = DLInfoC     message =       "Avoid use of wget without progress bar. Use `wget --progress=dot:giga <url>`.\       \Or consider using `-q` or `-nv` (shorthands for `--quiet` or `--no-verbose`)."

@@ -84,3 +84,7 @@        in do             ruleCatchesNot "DL3018" $ Text.unlines dockerFile             onBuildRuleCatchesNot "DL3018" $ Text.unlines dockerFile++    it "don't trigger when installing from .apk file" $ do+      ruleCatchesNot "DL3018" "RUN apk add mypackage-1.1.1.apk"+      onBuildRuleCatchesNot "DL3018" "RUN apk add mypackage-1.1.1.apk"