git.iko.soy/docker-hs
on master help sign in
Merge pull request #32 from jprider63/master

Makes `oomKillDisable` in `ContainerResources` optional.

commit98f3c027e52ba6bcdc06fe32bcd0ba195ad88de4 authorDeni Bertovic <deni@denibertovic.com> dateThu 29 Jun 2017, 08:12 (9 years ago) parentab9b122fa421b9
2 files changed+3−3
compare with master
unifiedsplit
docker.cabal+1−1 src/Docker/Client/Types.hs+2−2
docker.cabal+1−1
@@ -1,5 +1,5 @@
11name: docker
2−version: 0.4.0.0
2+version: 0.4.0.1
33synopsis: An API client for docker written in Haskell
44description: See API documentation below.
55homepage: https://github.com/denibertovic/docker-hs
src/Docker/Client/Types.hs+2−2
@@ -698,7 +698,7 @@ defaultContainerResources = ContainerResources {
698698 , memory=Nothing
699699 , memoryReservation=Nothing
700700 , memorySwap=Nothing
701− , oomKillDisable=False
701+ , oomKillDisable=Just False
702702 , ulimits=[]
703703 }
704704
@@ -1310,7 +1310,7 @@ data ContainerResources = ContainerResources {
13101310 , memoryReservation :: Maybe MemoryConstraint
13111311 , memorySwap :: Maybe MemoryConstraint
13121312 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1313− , oomKillDisable :: Bool
1313+ , oomKillDisable :: Maybe Bool
13141314 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
13151315 , ulimits :: [Ulimit]
13161316 -- TODO: Missing from 1.24