git.iko.soy/docker-hs
on master help sign in
Makes `oomKillDisable` in `ContainerResources` optional.
fa421b9James Parker
docker.cabal+1−1
compare with master
unifiedsplit
@@ -1,5 +1,5 @@
1name: docker
1name: docker
2−version: 0.4.0.0
2+version: 0.4.0.1
3synopsis: An API client for docker written in Haskell
3synopsis: An API client for docker written in Haskell
4description: See API documentation below.
4description: See API documentation below.
5homepage: https://github.com/denibertovic/docker-hs
5homepage: https://github.com/denibertovic/docker-hs
src/Docker/Client/Types.hs+2−2
@@ -698,7 +698,7 @@ defaultContainerResources = ContainerResources {
698 , memory=Nothing
698 , memory=Nothing
699 , memoryReservation=Nothing
699 , memoryReservation=Nothing
700 , memorySwap=Nothing
700 , memorySwap=Nothing
701− , oomKillDisable=False
701+ , oomKillDisable=Just False
702 , ulimits=[]
702 , ulimits=[]
703 }
703 }
704
704
@@ -1310,7 +1310,7 @@ data ContainerResources = ContainerResources {
1310 , memoryReservation :: Maybe MemoryConstraint
1310 , memoryReservation :: Maybe MemoryConstraint
1311 , memorySwap :: Maybe MemoryConstraint
1311 , memorySwap :: Maybe MemoryConstraint
1312 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1312 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1313− , oomKillDisable :: Bool
1313+ , oomKillDisable :: Maybe Bool
1314 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1314 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1315 , ulimits :: [Ulimit]
1315 , ulimits :: [Ulimit]
1316 -- TODO: Missing from 1.24
1316 -- TODO: Missing from 1.24