hadolint 2.6.0 → 2.6.1

raw patch · 5 files changed

+40/−7 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hadolint.cabal +1/−1
• src/Hadolint/Rule/DL3009.hs +10/−2
• src/Hadolint/Rule/DL3019.hs +16/−4
• test/DL3009.hs +4/−0
• test/DL3019.hs +9/−0

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

@@ -23,8 +23,9 @@     message = "Delete the apt-get lists after installing something"      check line st (From from) = st |> modify (rememberStage line from)-    check line st (Run (RunArgs args _))-      | foldArguments forgotToCleanup args = st |> modify (rememberLine line)+    check line st (Run (RunArgs args flags))+      | hasNoCacheMount flags && foldArguments forgotToCleanup args =+          st |> modify (rememberLine line)       | otherwise = st     check _ st _ = st @@ -58,6 +59,13 @@       any (Shell.cmdHasArgs "rm" ["-rf", "/var/lib/apt/lists/*"]) (Shell.presentCommands args)      hasUpdate = any (Shell.cmdHasArgs "apt-get" ["update"]) (Shell.presentCommands args)++hasNoCacheMount :: RunFlags -> Bool+hasNoCacheMount RunFlags+  { mount =+      Just (CacheMount CacheOpts {cTarget = TargetPath {unTargetPath = p}})+  } = Text.dropWhileEnd (=='/') p /= "/var/lib/apt/lists"+hasNoCacheMount RunFlags {} = True  -- | Even though dockerfiles without a FROM are not valid, we still want to provide some feedback for this rule -- so we pretend there is a base image at the start of the file if there is none

@@ -1,5 +1,6 @@ module Hadolint.Rule.DL3019 (rule) where +import qualified Data.Text as Text import Hadolint.Rule import Hadolint.Shell (ParsedShell) import qualified Hadolint.Shell as Shell@@ -11,9 +12,20 @@     code = "DL3019"     severity = DLInfoC     message =-      "Use the `--no-cache` switch to avoid the need to use `--update` and remove \-      \`/var/cache/apk/*` when done installing packages"-    check (Run (RunArgs args _)) = foldArguments (Shell.noCommands forgotCacheOption) args+      "Use the `--no-cache` switch to avoid the need to use `--update` and \+      \remove `/var/cache/apk/*` when done installing packages"+    check (Run (RunArgs args flags)) = hasCacheMount flags+      || foldArguments (Shell.noCommands forgotCacheOption) args     check _ = True-    forgotCacheOption cmd = Shell.cmdHasArgs "apk" ["add"] cmd && not (Shell.hasFlag "no-cache" cmd) {-# INLINEABLE rule #-}++hasCacheMount :: RunFlags -> Bool+hasCacheMount RunFlags+  { mount =+      Just (CacheMount CacheOpts {cTarget = TargetPath {unTargetPath = p}})+  } = Text.dropWhileEnd (=='/') p == "/var/cache/apk"+hasCacheMount RunFlags {} = False++forgotCacheOption :: Shell.Command -> Bool+forgotCacheOption cmd = Shell.cmdHasArgs "apk" ["add"] cmd+  && not (Shell.hasFlag "no-cache" cmd)

@@ -75,3 +75,7 @@        in do             ruleCatchesNot "DL3009" $ Text.unlines dockerFile             onBuildRuleCatchesNot "DL3009" $ Text.unlines dockerFile++    it "don't warn: BuildKit cache mount to apt lists directory" $ do+      ruleCatchesNot "DL3009" "RUN --mount=type=cache,target=/var/lib/apt/lists apt-get update && apt-get install python"+      onBuildRuleCatchesNot "DL3009" "RUN --mount=type=cache,target=/var/lib/apt/lists apt-get update && apt-get install python"

@@ -14,3 +14,12 @@     it "apk add without --no-cache" $ do       ruleCatchesNot "DL3019" "RUN apk add --no-cache flex=2.6.4-r1"       onBuildRuleCatchesNot "DL3019" "RUN apk add --no-cache flex=2.6.4-r1"+    it "don't warn: apk add with BuildKit cache mount" $ do+      ruleCatchesNot "DL3019" "RUN --mount=type=cache,target=/var/cache/apk apk add -U curl=7.77.0"+      onBuildRuleCatchesNot "DL3019" "RUN --mount=type=cache,target=/var/cache/apk apk add -U curl=7.77.0"+    it "don't warn: apk add with BuildKit cache mount in wrong dir and --no-cache" $ do+      ruleCatchesNot "DL3019" "RUN --mount=type=cache,target=/var/cache/foo apk add --no-cache -U curl=7.77.0"+      onBuildRuleCatchesNot "DL3019" "RUN --mount=type=cache,target=/var/cache/foo apk add --no-cache -U curl=7.77.0"+    it "warn: apk add with BuildKit cache mount to wrong dir" $ do+      ruleCatches "DL3019" "RUN --mount=type=cache,target=/var/cache/foo apk add -U curl=7.77.0"+      onBuildRuleCatches "DL3019" "RUN --mount=type=cache,target=/var/cache/foo apk add -U curl=7.77.0"