buffet 0.5.0 → 1.0.1

raw patch · 5 files changed

+7/−33 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• README.md +1/−2
• buffet.cabal +5/−6
• src/Buffet.hs +1/−1
• src/Buffet/Assemble/JoinConsecutiveEnvInstructions.hs +0/−14
• src/Buffet/Assemble/ScheduleParallelInstructions.hs +0/−10

@@ -1,7 +1,6 @@ # Buffet 🍜 -[![Build](https://img.shields.io/travis/evolutics/buffet)](https://travis-ci.org/evolutics/buffet)-[![License](https://img.shields.io/github/license/evolutics/buffet)](LICENSE)+![Build](https://github.com/evolutics/buffet/workflows/build/badge.svg) [![Package](https://img.shields.io/hackage/v/buffet)](https://hackage.haskell.org/package/buffet)  Assemble many Dockerfiles in a single Dockerfile. This gives you the convenience of one Docker image with your favorite tools while keeping a separate Dockerfile per tool.

@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 1a2db84508718f76303fe3c239a753d2c8b79cf4a769261f6b911eb93c3dfac8+-- hash: bbe22f2b658179cf59499e60c307c649c4660c251763499d31492a93678bcb39  name:           buffet-version:        0.5.0+version:        1.0.1 synopsis:       Assembles many Dockerfiles in one. description:    See https://github.com/evolutics/buffet category:       Development@@ -37,7 +37,6 @@       Buffet.Assemble.GlobalBuildStage       Buffet.Assemble.HasArgInstructionWithName       Buffet.Assemble.InsertOptionArgInstructionUnlessPresent-      Buffet.Assemble.JoinConsecutiveEnvInstructions       Buffet.Assemble.JoinConsecutiveRunInstructions       Buffet.Assemble.LocalBuildStages       Buffet.Assemble.ScheduleParallelInstructions@@ -79,7 +78,7 @@       Paths_buffet   hs-source-dirs:       src-  ghc-options: -Weverything -Wno-unsafe -Wno-safe -Wno-missing-deriving-strategies -Wno-missing-local-signatures+  ghc-options: -Weverything -Wno-all-missed-specialisations -Wno-missing-deriving-strategies -Wno-missing-local-signatures -Wno-safe -Wno-unsafe   build-depends:       aeson     , aeson-pretty@@ -111,7 +110,7 @@       Paths_buffet   hs-source-dirs:       app-  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Weverything -Wno-unsafe -Wno-safe -Wno-missing-deriving-strategies -Wno-missing-local-signatures+  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Weverything -Wno-all-missed-specialisations -Wno-missing-deriving-strategies -Wno-missing-local-signatures -Wno-safe -Wno-unsafe   build-depends:       base >=4.7 && <5     , buffet-internal@@ -131,7 +130,7 @@       Paths_buffet   hs-source-dirs:       test-  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Weverything -Wno-unsafe -Wno-safe -Wno-missing-deriving-strategies -Wno-missing-local-signatures+  ghc-options: -threaded -rtsopts -with-rtsopts=-N -Weverything -Wno-all-missed-specialisations -Wno-missing-deriving-strategies -Wno-missing-local-signatures -Wno-safe -Wno-unsafe   build-depends:       aeson     , base >=4.7 && <5

@@ -42,7 +42,7 @@  versionOption :: Options.Parser (a -> a) versionOption =-  Options.infoOption "Buffet 0.5.0" $+  Options.infoOption "Buffet 1.0.1" $   mconcat     [Options.long "version", Options.helpDoc $ Just versionHelp, Options.hidden]   where

@@ -1,14 +0,0 @@-module Buffet.Assemble.JoinConsecutiveEnvInstructions-  ( get-  ) where--import qualified Buffet.Ir.Ir as Ir-import qualified Language.Docker as Docker-import Prelude ((<>), foldr)--get :: Ir.DockerfilePart -> Ir.DockerfilePart-get = foldr process []-  where-    process (Docker.Env first) (Docker.Env second:rest) =-      Docker.Env (first <> second) : rest-    process first rest = first : rest

@@ -2,7 +2,6 @@   ( get   ) where -import qualified Buffet.Assemble.JoinConsecutiveEnvInstructions as JoinConsecutiveEnvInstructions import qualified Buffet.Assemble.JoinConsecutiveRunInstructions as JoinConsecutiveRunInstructions import qualified Buffet.Ir.Ir as Ir import qualified Data.List.NonEmpty as NonEmpty@@ -58,7 +57,6 @@       , scheduleArgInstructions       , scheduleShellInstructions       , scheduleCopyInstructions-      , scheduleEnvInstructions       , scheduleRunInstructions       , scheduleWorkdirInstructions       , scheduleCommentInstructions@@ -104,14 +102,6 @@ spanInstructions isRelevant queues = (mconcat spans, queues')   where     (spans, queues') = unzip $ fmap (span isRelevant) queues--scheduleEnvInstructions :: ScheduleStep-scheduleEnvInstructions queues =-  (JoinConsecutiveEnvInstructions.get envs, queues')-  where-    (envs, queues') = spanInstructions isEnv queues-    isEnv (Docker.Env _) = True-    isEnv _ = False  scheduleRunInstructions :: ScheduleStep scheduleRunInstructions queues =