language-docker 6.0.3 → 6.0.4
raw patch · 3 files changed
+8/−3 lines, 3 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Language.Docker: arg :: forall m_aOAU. MonadFree EInstruction m_aOAU => Text -> Maybe Text -> m_aOAU ()
+ Language.Docker: arg :: forall m_aOCa. MonadFree EInstruction m_aOCa => Text -> Maybe Text -> m_aOCa ()
- Language.Docker: cmdArgs :: forall m_aOAw. MonadFree EInstruction m_aOAw => Arguments Text -> m_aOAw ()
+ Language.Docker: cmdArgs :: forall m_aOBM. MonadFree EInstruction m_aOBM => Arguments Text -> m_aOBM ()
- Language.Docker: comment :: forall m_aOAY. MonadFree EInstruction m_aOAY => Text -> m_aOAY ()
+ Language.Docker: comment :: forall m_aOCe. MonadFree EInstruction m_aOCe => Text -> m_aOCe ()
- Language.Docker: embed :: forall m_aOB7. MonadFree EInstruction m_aOB7 => [InstructionPos Text] -> m_aOB7 ()
+ Language.Docker: embed :: forall m_aOCn. MonadFree EInstruction m_aOCn => [InstructionPos Text] -> m_aOCn ()
- Language.Docker: entrypointArgs :: forall m_aOAL. MonadFree EInstruction m_aOAL => Arguments Text -> m_aOAL ()
+ Language.Docker: entrypointArgs :: forall m_aOC1. MonadFree EInstruction m_aOC1 => Arguments Text -> m_aOC1 ()
- Language.Docker: env :: forall m_aOAR. MonadFree EInstruction m_aOAR => Pairs -> m_aOAR ()
+ Language.Docker: env :: forall m_aOC7. MonadFree EInstruction m_aOC7 => Pairs -> m_aOC7 ()
- Language.Docker: expose :: forall m_aOAF. MonadFree EInstruction m_aOAF => Ports -> m_aOAF ()
+ Language.Docker: expose :: forall m_aOBV. MonadFree EInstruction m_aOBV => Ports -> m_aOBV ()
- Language.Docker: from :: forall m_aOzu. MonadFree EInstruction m_aOzu => EBaseImage -> m_aOzu ()
+ Language.Docker: from :: forall m_aOAK. MonadFree EInstruction m_aOAK => EBaseImage -> m_aOAK ()
- Language.Docker: healthcheck :: forall m_aOB1. MonadFree EInstruction m_aOB1 => Check Text -> m_aOB1 ()
+ Language.Docker: healthcheck :: forall m_aOCh. MonadFree EInstruction m_aOCh => Check Text -> m_aOCh ()
- Language.Docker: label :: forall m_aOAh. MonadFree EInstruction m_aOAh => Pairs -> m_aOAh ()
+ Language.Docker: label :: forall m_aOBx. MonadFree EInstruction m_aOBx => Pairs -> m_aOBx ()
- Language.Docker: maintainer :: forall m_aOAO. MonadFree EInstruction m_aOAO => Text -> m_aOAO ()
+ Language.Docker: maintainer :: forall m_aOC4. MonadFree EInstruction m_aOC4 => Text -> m_aOC4 ()
- Language.Docker: onBuildRaw :: forall m_aOB4. MonadFree EInstruction m_aOB4 => Instruction Text -> m_aOB4 ()
+ Language.Docker: onBuildRaw :: forall m_aOCk. MonadFree EInstruction m_aOCk => Instruction Text -> m_aOCk ()
- Language.Docker: runArgs :: forall m_aOAt. MonadFree EInstruction m_aOAt => Arguments Text -> m_aOAt ()
+ Language.Docker: runArgs :: forall m_aOBJ. MonadFree EInstruction m_aOBJ => Arguments Text -> m_aOBJ ()
- Language.Docker: stopSignal :: forall m_aOAk. MonadFree EInstruction m_aOAk => Text -> m_aOAk ()
+ Language.Docker: stopSignal :: forall m_aOBA. MonadFree EInstruction m_aOBA => Text -> m_aOBA ()
- Language.Docker: user :: forall m_aOAe. MonadFree EInstruction m_aOAe => Text -> m_aOAe ()
+ Language.Docker: user :: forall m_aOBu. MonadFree EInstruction m_aOBu => Text -> m_aOBu ()
- Language.Docker: volume :: forall m_aOAI. MonadFree EInstruction m_aOAI => Text -> m_aOAI ()
+ Language.Docker: volume :: forall m_aOBY. MonadFree EInstruction m_aOBY => Text -> m_aOBY ()
- Language.Docker: workdir :: forall m_aOAC. MonadFree EInstruction m_aOAC => Directory -> m_aOAC ()
+ Language.Docker: workdir :: forall m_aOBS. MonadFree EInstruction m_aOBS => Directory -> m_aOBS ()
- Language.Docker.EDSL: addArgs :: forall m_aOA9. MonadFree EInstruction m_aOA9 => NonEmpty SourcePath -> TargetPath -> Chown -> m_aOA9 ()
+ Language.Docker.EDSL: addArgs :: forall m_aOBp. MonadFree EInstruction m_aOBp => NonEmpty SourcePath -> TargetPath -> Chown -> m_aOBp ()
- Language.Docker.EDSL: arg :: forall m_aOAU. MonadFree EInstruction m_aOAU => Text -> Maybe Text -> m_aOAU ()
+ Language.Docker.EDSL: arg :: forall m_aOCa. MonadFree EInstruction m_aOCa => Text -> Maybe Text -> m_aOCa ()
- Language.Docker.EDSL: cmdArgs :: forall m_aOAw. MonadFree EInstruction m_aOAw => Arguments Text -> m_aOAw ()
+ Language.Docker.EDSL: cmdArgs :: forall m_aOBM. MonadFree EInstruction m_aOBM => Arguments Text -> m_aOBM ()
- Language.Docker.EDSL: comment :: forall m_aOAY. MonadFree EInstruction m_aOAY => Text -> m_aOAY ()
+ Language.Docker.EDSL: comment :: forall m_aOCe. MonadFree EInstruction m_aOCe => Text -> m_aOCe ()
- Language.Docker.EDSL: copyArgs :: forall m_aOAn. MonadFree EInstruction m_aOAn => NonEmpty SourcePath -> TargetPath -> Chown -> CopySource -> m_aOAn ()
+ Language.Docker.EDSL: copyArgs :: forall m_aOBD. MonadFree EInstruction m_aOBD => NonEmpty SourcePath -> TargetPath -> Chown -> CopySource -> m_aOBD ()
- Language.Docker.EDSL: embed :: forall m_aOB7. MonadFree EInstruction m_aOB7 => [InstructionPos Text] -> m_aOB7 ()
+ Language.Docker.EDSL: embed :: forall m_aOCn. MonadFree EInstruction m_aOCn => [InstructionPos Text] -> m_aOCn ()
- Language.Docker.EDSL: entrypointArgs :: forall m_aOAL. MonadFree EInstruction m_aOAL => Arguments Text -> m_aOAL ()
+ Language.Docker.EDSL: entrypointArgs :: forall m_aOC1. MonadFree EInstruction m_aOC1 => Arguments Text -> m_aOC1 ()
- Language.Docker.EDSL: env :: forall m_aOAR. MonadFree EInstruction m_aOAR => Pairs -> m_aOAR ()
+ Language.Docker.EDSL: env :: forall m_aOC7. MonadFree EInstruction m_aOC7 => Pairs -> m_aOC7 ()
- Language.Docker.EDSL: expose :: forall m_aOAF. MonadFree EInstruction m_aOAF => Ports -> m_aOAF ()
+ Language.Docker.EDSL: expose :: forall m_aOBV. MonadFree EInstruction m_aOBV => Ports -> m_aOBV ()
- Language.Docker.EDSL: from :: forall m_aOzu. MonadFree EInstruction m_aOzu => EBaseImage -> m_aOzu ()
+ Language.Docker.EDSL: from :: forall m_aOAK. MonadFree EInstruction m_aOAK => EBaseImage -> m_aOAK ()
- Language.Docker.EDSL: healthcheck :: forall m_aOB1. MonadFree EInstruction m_aOB1 => Check Text -> m_aOB1 ()
+ Language.Docker.EDSL: healthcheck :: forall m_aOCh. MonadFree EInstruction m_aOCh => Check Text -> m_aOCh ()
- Language.Docker.EDSL: label :: forall m_aOAh. MonadFree EInstruction m_aOAh => Pairs -> m_aOAh ()
+ Language.Docker.EDSL: label :: forall m_aOBx. MonadFree EInstruction m_aOBx => Pairs -> m_aOBx ()
- Language.Docker.EDSL: maintainer :: forall m_aOAO. MonadFree EInstruction m_aOAO => Text -> m_aOAO ()
+ Language.Docker.EDSL: maintainer :: forall m_aOC4. MonadFree EInstruction m_aOC4 => Text -> m_aOC4 ()
- Language.Docker.EDSL: onBuildRaw :: forall m_aOB4. MonadFree EInstruction m_aOB4 => Instruction Text -> m_aOB4 ()
+ Language.Docker.EDSL: onBuildRaw :: forall m_aOCk. MonadFree EInstruction m_aOCk => Instruction Text -> m_aOCk ()
- Language.Docker.EDSL: runArgs :: forall m_aOAt. MonadFree EInstruction m_aOAt => Arguments Text -> m_aOAt ()
+ Language.Docker.EDSL: runArgs :: forall m_aOBJ. MonadFree EInstruction m_aOBJ => Arguments Text -> m_aOBJ ()
- Language.Docker.EDSL: shell :: forall m_aOAz. MonadFree EInstruction m_aOAz => Arguments Text -> m_aOAz ()
+ Language.Docker.EDSL: shell :: forall m_aOBP. MonadFree EInstruction m_aOBP => Arguments Text -> m_aOBP ()
- Language.Docker.EDSL: stopSignal :: forall m_aOAk. MonadFree EInstruction m_aOAk => Text -> m_aOAk ()
+ Language.Docker.EDSL: stopSignal :: forall m_aOBA. MonadFree EInstruction m_aOBA => Text -> m_aOBA ()
- Language.Docker.EDSL: user :: forall m_aOAe. MonadFree EInstruction m_aOAe => Text -> m_aOAe ()
+ Language.Docker.EDSL: user :: forall m_aOBu. MonadFree EInstruction m_aOBu => Text -> m_aOBu ()
- Language.Docker.EDSL: volume :: forall m_aOAI. MonadFree EInstruction m_aOAI => Text -> m_aOAI ()
+ Language.Docker.EDSL: volume :: forall m_aOBY. MonadFree EInstruction m_aOBY => Text -> m_aOBY ()
- Language.Docker.EDSL: workdir :: forall m_aOAC. MonadFree EInstruction m_aOAC => Directory -> m_aOAC ()
+ Language.Docker.EDSL: workdir :: forall m_aOBS. MonadFree EInstruction m_aOBS => Directory -> m_aOBS ()
Files
- language-docker.cabal +2/−2
- src/Language/Docker/Parser.hs +1/−1
- test/Language/Docker/ParserSpec.hs +5/−0
language-docker.cabal view
@@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 62fe44c8aed9783d0a7b6fee136758ea45af0c4ad6af24b6496af43df80eb3b9+-- hash: 64e893f351e7689307e2cbe6595ac2c624f727f4e02b9ff0aae6ec166f4cf5d4 name: language-docker-version: 6.0.3+version: 6.0.4 synopsis: Dockerfile parser, pretty-printer and embedded DSL description: All functions for parsing, printing and writting Dockerfiles are exported through @Language.Docker@. For more fine-grained operations look for specific modules that implement a certain functionality. See the <https://github.com/hadolint/language-docker GitHub project> for the source-code and examples.
src/Language/Docker/Parser.hs view
@@ -91,7 +91,7 @@ return (T.pack lit) brackets :: Parser a -> Parser a-brackets = between (symbol "[") (symbol "]")+brackets = between (symbol "[" *> spaces) (spaces *> symbol "]") spaces1 :: Parser () spaces1 = void (takeWhile1P (Just "at least one space") (\c -> c == ' ' || c == '\t'))
test/Language/Docker/ParserSpec.hs view
@@ -140,6 +140,11 @@ ] in assertAst dockerfile [Run $ ArgumentsText "echo foo", Run $ ArgumentsList "echo foo"] + it "Accepts spaces inside the brackets" $+ let dockerfile = Text.unlines [ "RUN [ \"echo\", \"foo\" ]"+ ]+ in assertAst dockerfile [Run $ ArgumentsList "echo foo"]+ describe "parse CMD" $ do it "one line cmd" $ assertAst "CMD true" [Cmd "true"] it "cmd over several lines" $