dockercook 0.1.0.0 → 0.1.1.0
raw patch · 3 files changed
+12/−5 lines, 3 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Cook.Build: cookBuild :: CookConfig -> IO ()
+ Cook.Build: cookBuild :: CookConfig -> IO [DockerImage]
Files
- dockercook.cabal +7/−1
- src/lib/Cook/Build.hs +3/−3
- src/prog/Main.hs +2/−1
dockercook.cabal view
@@ -1,5 +1,5 @@ name: dockercook-version: 0.1.0.0+version: 0.1.1.0 synopsis: A build tool for multiple docker image layers description: Build and manage multiple docker image layers to speed up deployment license: MIT@@ -9,6 +9,8 @@ copyright: (c) 2014 factis research GmbH category: Development build-type: Simple+homepage: https://github.com/factisresearch/dockercook+bug-reports: https://github.com/factisresearch/dockercook/issues cabal-version: >=1.8 library@@ -67,3 +69,7 @@ text >=1.1 && <1.2, vector >=0.10 && <0.11 ghc-options: -Wall -fno-warn-orphans++source-repository head+ type: git+ location: git://github.com/factisresearch/dockercook.git
src/lib/Cook/Build.hs view
@@ -164,16 +164,16 @@ targetedFiles = filter (\(fp, _) -> isNeededHash fp) fileHashes -cookBuild :: CookConfig -> IO ()+cookBuild :: CookConfig -> IO [DockerImage] cookBuild cfg@(CookConfig{..}) = do stateManager <- createStateManager cc_stateDir boring <- liftM (fromMaybe []) $ T.mapM (liftM parseBoring . T.readFile) cc_boringFile fileHashes <- makeDirectoryFileHashTable (isBoring boring) cc_dataDir roots <- mapM ((prepareEntryPoint cc_buildFileDir) . BuildFileId . T.pack) cc_buildEntryPoints- mapM_ (buildImage cfg stateManager fileHashes) roots+ res <- mapM (buildImage cfg stateManager fileHashes) roots logInfo "All done!"- return ()+ return res where parseBoring = map (mkRegex . T.unpack) . filter (not . ("#" `T.isPrefixOf`) . T.strip) . T.lines
src/prog/Main.hs view
@@ -9,7 +9,8 @@ runProg cmd = case cmd of CookBuild buildCfg ->- cookBuild buildCfg+ do _ <- cookBuild buildCfg+ return () CookClean stateDir daysToKeep -> cookClean stateDir daysToKeep CookList ->