@@ -11,7 +11,11 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14+ , NetworkID
15+ , fromNetworkID
16+ , toNetworkID
1417 , Timeout(..)
18+ , StatusCode(..)
1519 , Signal(..)
1620 , ContainerDetails(..)
1721 , DockerClientOpts(..)
@@ -22,23 +26,30 @@ module Docker.Client.Types (
2226 , ContainerPortInfo(..)
2327 , Container(..)
2428 , ContainerState(..)
25− , Status(..)
29+ , State(..)
2630 , Digest
27− , Labels(..)
31+ , Label(..)
2832 , Tag
2933 , Image(..)
34+ , Entrypoint(..)
3035 , dropImagePrefix
3136 , CreateOpts(..)
37+ , BuildOpts(..)
38+ , defaultBuildOpts
3239 , defaultCreateOpts
3340 , DetachKeys(..)
3441 , StartOpts(..)
3542 , defaultStartOpts
36− , DeleteOpts(..)
37− , defaultDeleteOpts
43+ , ContainerDeleteOpts(..)
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
3847 , Timestamp
3948 , TailLogOpt(..)
4049 , LogOpts(..)
4150 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
4253 , VolumePermission(..)
4354 , Bind(..)
4455 , Volume(..)
@@ -47,12 +58,12 @@ module Docker.Client.Types (
4758 , VolumeFrom(..)
4859 , Link(..)
4960 , LogDriverType(..)
50− , LogDriverOptions(..)
61+ , LogDriverOption(..)
5162 , LogDriverConfig(..)
5263 , NetworkMode(..)
5364 , PortType(..)
5465-- , NetworkInterface(..)
55− , Networks(..)
66+ , Network(..)
5667 , NetworkSettings(..)
5768 , NetworkOptions(..)
5869 , Mount(..)
@@ -64,6 +75,8 @@ module Docker.Client.Types (
6475 , UTSMode(..)
6576 , HostConfig(..)
6677 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
6780 , Ulimit(..)
6881 , ContainerResources(..)
6982 , defaultContainerResources
@@ -73,15 +86,18 @@ module Docker.Client.Types (
7386 , EnvVar(..)
7487 , ContainerConfig(..)
7588 , defaultContainerConfig
76− , ExposedPorts(..)
89+ , ExposedPort(..)
7790 , DeviceWeight(..)
7891 , DeviceRate(..)
7992 , addPortBinding
93+ , addExposedPort
8094 , addBind
8195 , setCmd
8296 , addLink
8397 , addVolume
8498 , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
85101 ) where
86102
87103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -91,11 +107,12 @@ import qualified Data.Aeson as JSON
91107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
92108import Data.Char (isAlphaNum, toUpper)
93109import qualified Data.HashMap.Strict as HM
94−import qualified Data.Map as M
95110import Data.Monoid ((<>))
111+import Data.Scientific (floatingOrInteger)
96112import Data.Text (Text)
97113import qualified Data.Text as T
98114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
99116import GHC.Generics (Generic)
100117import Prelude hiding (all, tail)
101118import Text.Read (readMaybe)
@@ -108,14 +125,20 @@ data Endpoint =
108125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
109126 | StartContainerEndpoint StartOpts ContainerID
110127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
111129 | KillContainerEndpoint Signal ContainerID
112130 | RestartContainerEndpoint Timeout ContainerID
113131 | PauseContainerEndpoint ContainerID
114132 | UnpauseContainerEndpoint ContainerID
115133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
116134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
117− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
118136 | InspectContainerEndpoint ContainerID
137+ | BuildImageEndpoint BuildOpts FilePath
138+ | CreateImageEndpoint T.Text Tag (Maybe T.Text) -- ^ Either pull an image from docker hub or imports an image from a tarball (or URL)
139+ | DeleteImageEndpoint ImageDeleteOpts ImageID
140+ | CreateNetworkEndpoint CreateNetworkOpts
141+ | RemoveNetworkEndpoint NetworkID
119142 deriving (Eq, Show)
120143
121144-- | We should newtype this
@@ -162,6 +185,20 @@ toImageID t =
162185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
163186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
164187
188+data StatusCode = StatusCode Int
189+
190+instance ToJSON StatusCode where
191+ toJSON (StatusCode c) = object ["StatusCode" .= c]
192+
193+instance FromJSON StatusCode where
194+ parseJSON (JSON.Object o) = do
195+ c <- o .: "StatusCode"
196+ if c >= 0 && c <= 255 then
197+ return (StatusCode c)
198+ else
199+ fail "Unknown exit code"
200+ parseJSON _ = fail "Unknown exit code"
201+
165202-- TODO: Add more Signals or use an existing lib
166203-- | Signal used for sending to the process running in the container.
167204-- The default signal is SIGTERM.
@@ -176,16 +213,16 @@ data Signal = SIGHUP
176213
177214instance FromJSON Signal where
178215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
179− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
180− parseJSON (JSON.String "SIGINT") = return SIGINT
216+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217+ parseJSON (JSON.String "SIGINT") = return SIGINT
181218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
182219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
183220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
184− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
185222
186223instance ToJSON Signal where
187− toJSON SIGHUP = "SIGHUP"
188− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
189226 toJSON SIGQUIT = "SIGQUIT"
190227 toJSON SIGSTOP = "SIGSTOP"
191228 toJSON SIGTERM = "SIGTERM"
@@ -213,7 +250,7 @@ data ContainerDetails = ContainerDetails {
213250 , processLabel :: Text
214251 , resolveConfPath :: FilePath
215252 , restartCount :: Int
216− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
217254 , mounts :: [Mount]
218255 }
219256 deriving (Eq, Show, Generic)
@@ -221,11 +258,11 @@ data ContainerDetails = ContainerDetails {
221258-- | Data type used for parsing the mount information from a container
222259-- list.
223260data Mount = Mount {
224− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
225262 , mountSource :: FilePath
226263 , mountDestination :: FilePath
227− , mountDriver :: Text
228− , mountMode :: Maybe VolumePermission -- apparently this can be null
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
229266 , mountRW :: Bool
230267 , mountPropogation :: Text
231268 }
@@ -233,14 +270,14 @@ data Mount = Mount {
233270
234271instance FromJSON Mount where
235272 parseJSON (JSON.Object o) = do
236− name <- o .: "Name"
273+ name <- o .:? "Name"
237274 src <- o .: "Source"
238275 dest <- o .: "Destination"
239− driver <- o .: "Driver"
240− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
241278 rw <- o .: "RW"
242279 prop <- o .: "Propagation"
243− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
244281 parseJSON _ = fail "Mount is not an object"
245282
246283-- | Data type used for parsing the container state from a list of
@@ -256,7 +293,7 @@ data ContainerState = ContainerState {
256293 , restarting :: Bool
257294 , running :: Bool
258295 , startedAt :: UTCTime
259− , status :: Status
296+ , state :: State
260297 }
261298 deriving (Eq, Show, Generic)
262299
@@ -419,20 +456,17 @@ instance FromJSON NetworkOptions where
419456 parseJSON _ = fail "NetworkOptions is not an object"
420457
421458-- TODO: Not sure what this is used for anymore.
422−newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
459+data Network = Network NetworkMode NetworkOptions
423460 deriving (Eq, Show)
424461
425−instance FromJSON Networks where
426− parseJSON (JSON.Object o) = do
427− Networks <$> HM.foldlWithKey' f (return M.empty) o
428−
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
463+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
429464 where
430465 f accM k' v' = do
431466 acc <- accM
432467 k <- parseJSON $ JSON.String k'
433468 v <- parseJSON v'
434− return $ M.insert k v acc
435−
469+ return $ (Network k v):acc
436470 parseJSON _ = fail "Networks is not an object"
437471
438472-- | Data type reprsenting the various network settings a container can have.
@@ -454,7 +488,7 @@ data NetworkSettings = NetworkSettings {
454488 , networkSettingsIpPrefixLen :: Int
455489 , networkSettingsIpv6Gateway :: Text
456490 , networkSettingsMacAddress :: Text
457− , networkSettingsNetworks :: Networks
491+ , networkSettingsNetworks :: [Network]
458492 }
459493 deriving (Eq, Show)
460494
@@ -489,21 +523,23 @@ data Container = Container
489523 , containerImageId :: ImageID
490524 , containerCommand :: Text
491525 , containerCreatedAt :: Int
492− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
493528 , containerPorts :: [ContainerPortInfo]
494− , containerLabels :: Labels
495− , containerNetworks :: Networks
529+ , containerLabels :: [Label]
530+ , containerNetworks :: [Network]
496531 , containerMounts :: [Mount]
497532 } deriving (Show, Eq)
498533
499534instance FromJSON Container where
500− parseJSON (JSON.Object v) =
501− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
502537 <*> (v .: "Names")
503538 <*> (v .: "Image")
504− <*> (v .: "ImageID")
505− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
506541 <*> (v .: "Created")
542+ <*> (v .: "State")
507543 <*> (v .: "Status")
508544 <*> (v .: "Ports")
509545 <*> (v .: "Labels")
@@ -513,34 +549,45 @@ instance FromJSON Container where
513549 parseNetworks (JSON.Object v) =
514550 (v .: "Networks") >>= parseJSON
515551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
516−
517552 parseJSON _ = fail "Container: Not a JSON object."
518553
519−-- | Represents the status of the container life cycle.
520−data Status = Created | Restarting | Running | Paused | Exited | Dead
554+-- | Represents the state of the container life cycle.
555+data State = Created | Restarting | Running | Paused | Exited | Dead
521556 deriving (Eq, Show, Generic)
522557
523−instance FromJSON Status where
524− parseJSON (JSON.String "running") = return Running
525− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
558+instance FromJSON State where
559+ parseJSON (JSON.String "running") = return Running
560+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
526561 parseJSON (JSON.String "restarting") = return Restarting
527− parseJSON (JSON.String "paused") = return Paused
528− parseJSON (JSON.String "exited") = return Exited
529− parseJSON (JSON.String "dead") = return Dead
530− parseJSON _ = fail "Unknown Status"
562+ parseJSON (JSON.String "paused") = return Paused
563+ parseJSON (JSON.String "exited") = return Exited
564+ parseJSON (JSON.String "dead") = return Dead
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
531566
532567-- | Alias for representing a RepoDigest. We could newtype this and add
533568-- some validation.
534569type Digest = Text
535570
536571-- | Container and Image Labels.
537−newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
572+data Label = Label Name Value deriving (Eq, Show)
538573
539−instance FromJSON Labels where
540− parseJSON val = Labels <$> parseJSON val
541574
542−instance ToJSON Labels where
543− toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
575+-- If there are multiple lables with the same Name in the list
576+-- then the last one wins.
577+instance {-# OVERLAPPING #-} ToJSON [Label] where
578+ toJSON [] = emptyJsonObject
579+ toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580+ where key (Label k _) = T.unpack k
581+ val (Label _ v) = v
582+
583+instance {-# OVERLAPPING #-} FromJSON [Label] where
584+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585+ where f accM k v = do
586+ acc <- accM
587+ value <- parseJSON v
588+ return $ (Label k value):acc
589+ parseJSON JSON.Null = return []
590+ parseJSON _ = fail "Failed to parse Labels. Not an object."
544591
545592-- | Alias for Tags.
546593type Tag = Text
@@ -551,10 +598,10 @@ data Image = DockerImage {
551598 , imageCreated :: Integer
552599 , imageParentId :: Maybe ImageID
553600 , imageRepoTags :: [Tag]
554− , imageRepoDigests :: Maybe [Digest]
601+ , imageRepoDigests :: [Digest]
555602 , imageSize :: Integer
556603 , imageVirtualSize :: Integer
557− , imageLabels :: Maybe Labels
604+ , imageLabels :: [Label]
558605 } deriving (Show, Eq, Generic)
559606
560607-- | Helper function used for dropping the "image" prefix when serializing
@@ -562,23 +609,60 @@ data Image = DockerImage {
562609dropImagePrefix :: [a] -> [a]
563610dropImagePrefix = drop 5
564611
612+
565613instance FromJSON Image where
566− parseJSON = genericParseJSON defaultOptions {
567− fieldLabelModifier = dropImagePrefix}
614+ parseJSON (JSON.Object o) = do
615+ imageId <- o .: "Id"
616+ imageCreated <- o .: "Created"
617+ imageParentId <- o .:? "ParentId"
618+ imageRepoTags <- o .:? "RepoTags" .!= []
619+ imageRepoDigests <- o .:? "RepoDigests" .!= []
620+ imageSize <- o .: "Size"
621+ imageVirtualSize <- o .: "VirtualSize"
622+ imageLabels <- o .:? "Labels" .!= []
623+ return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624+ parseJSON _ = fail "Failed to parse DockerImage."
625+
626+-- | Alias for Aliases.
627+type Alias = Text
628+
629+-- | EndpointsConfig is container configuration for a specific network
630+newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
631+
632+instance ToJSON EndpointConfig where
633+ toJSON (EndpointConfig aliases) = JSON.object
634+ [ "Aliases" .= aliases
635+ ]
636+
637+-- | Alias for endpoint name
638+type EndpointName = Text
639+
640+-- | Data type for the NetworkingConfig section of the container settings
641+newtype NetworkingConfig = NetworkingConfig
642+ { endpointsConfig :: HM.HashMap EndpointName EndpointConfig
643+ } deriving (Eq, Show)
644+
645+instance ToJSON NetworkingConfig where
646+ toJSON (NetworkingConfig endpointsConfig) = JSON.object
647+ [ "EndpointsConfig" .= endpointsConfig
648+ ]
568649
569650-- | Options used for creating a Container.
570651data CreateOpts = CreateOpts {
571− containerConfig :: ContainerConfig
572− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
573655 } deriving (Eq, Show)
574656
575657instance ToJSON CreateOpts where
576− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
577659 let ccJSON = toJSON cc
578660 let hcJSON = toJSON hc
579661 case ccJSON of
580662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
581− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665+ JSON.Object o2
582666 _ -> error "ContainerConfig is not an object." -- This should never happen.
583667
584668-- | Container configuration used for creating a container with sensible
@@ -592,7 +676,7 @@ defaultContainerConfig imageName = ContainerConfig {
592676 , attachStdout=False
593677 , image=imageName
594678 , attachStderr=False
595− , exposedPorts=Nothing -- ExposedPorts M.empty
679+ , exposedPorts=[]
596680 , tty=False
597681 , openStdin=False
598682 , stdinOnce=False
@@ -600,10 +684,10 @@ defaultContainerConfig imageName = ContainerConfig {
600684 , cmd=[]
601685 , volumes=[]
602686 , workingDir=Nothing
603− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
604688 , networkDisabled=Nothing
605689 , macAddress=Nothing
606− , labels=Nothing
690+ , labels=[]
607691 , stopSignal=SIGTERM
608692 }
609693
@@ -612,8 +696,8 @@ defaultHostConfig :: HostConfig
612696defaultHostConfig = HostConfig {
613697 binds=[]
614698 , containerIDFile=Nothing
615− , logConfig=LogDriverConfig JsonFile Nothing
616− , networkMode=Bridge
699+ , logConfig=LogDriverConfig JsonFile []
700+ , networkMode=NetworkBridge
617701 , portBindings=[]
618702 , restartPolicy=RestartOff
619703 , volumeDriver=Nothing
@@ -653,14 +737,18 @@ defaultContainerResources = ContainerResources {
653737 , memory=Nothing
654738 , memoryReservation=Nothing
655739 , memorySwap=Nothing
656− , oomKillDisable=False
740+ , oomKillDisable=Just False
657741 , ulimits=[]
658742 }
659743
660744-- | Default create options when creating a container. You only need to
661745-- specify an image name and the rest is all sensible defaults.
662746defaultCreateOpts :: T.Text -> CreateOpts
663−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
747+defaultCreateOpts imageName = CreateOpts
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
751+ }
664752
665753-- | Override the key sequence for detaching a container.
666754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -674,16 +762,45 @@ defaultStartOpts :: StartOpts
674762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
675763
676764-- | Options for deleting a container.
677−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
678766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
679767 , force :: Bool -- ^ If the container is still running force deletion anyway.
680768 } deriving (Eq, Show)
681769
770+-- TODO: Add support for container build constraints
771+-- | Options for when building images from a Dockerfile
772+data BuildOpts = BuildOpts {
773+ buildImageName :: Text -- ^ Image name in the form of name:tag; ie. myimage:latest.:w
774+ , buildDockerfileName :: Text -- ^ Name of dockerfile (default: Dockerfile)
775+ , buildQuiet :: Bool
776+ , buildNoCache :: Bool -- ^ Do not use cache when building the image.
777+ , buildRemoveItermediate :: Bool -- ^ Remove intermediate containers after a successful build (default true).
778+ , buildForceRemoveIntermediate :: Bool -- ^ Always remove intermediate containers.
779+ , buildPullParent :: Bool -- ^ Always attempt to pull a newer version of the *parent* image (ie. FROM debian:jessie).
780+ } deriving (Eq, Show)
781+
782+defaultBuildOpts :: Text -> BuildOpts
783+defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
784+ , buildDockerfileName = "Dockerfile"
785+ , buildQuiet = False
786+ , buildNoCache = False
787+ , buildRemoveItermediate = True
788+ , buildForceRemoveIntermediate = False
789+ , buildPullParent = False
790+ }
791+
682792-- | Default options for deleting a container. Most of the time we DON'T
683793-- want to delete the container's volumes or force delete it if it's
684794-- running.
685−defaultDeleteOpts :: DeleteOpts
686−defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
796+defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
797+
798+-- | Image delete opts
799+data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
800+
801+-- | Sane image deletion defaults
802+defaultImageDeleteOpts :: ImageDeleteOpts
803+defaultImageDeleteOpts = ImageDeleteOpts
687804
688805-- | Timestamp alias.
689806type Timestamp = Integer
@@ -711,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
711828 , tail = All
712829 }
713830
831+-- | Options for creating a network
832+data CreateNetworkOpts = CreateNetworkOpts
833+ { createNetworkName :: Text -- ^ The network's name
834+ , createNetworkCheckDuplicate :: Bool -- ^ Check for networks with duplicate names.
835+ , createNetworkDriver :: Text -- ^ Name of the network driver plugin to use.
836+ , createNetworkInternal :: Bool -- ^ Restrict external access to the network.
837+ , createNetworkEnableIPv6 :: Bool -- ^ Enable IPv6 on the network.
838+ } deriving (Eq, Show)
839+
840+-- | Sensible defalut for create network options
841+defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842+defaultCreateNetworkOpts name =
843+ CreateNetworkOpts
844+ { createNetworkName = name
845+ , createNetworkCheckDuplicate = False
846+ , createNetworkDriver = "bridge"
847+ , createNetworkInternal = True
848+ , createNetworkEnableIPv6 = False
849+ }
850+
851+instance ToJSON CreateNetworkOpts where
852+ toJSON opts =
853+ object
854+ [ "Name" .= createNetworkName opts
855+ , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856+ , "Driver" .= createNetworkDriver opts
857+ , "Internal" .= createNetworkInternal opts
858+ , "EnableIPv6" .= createNetworkEnableIPv6 opts
859+ ]
860+
714861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
715862-- | Set permissions on volumes that you mount in the container.
716863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
717864
718865instance ToJSON VolumePermission where
719866 toJSON ReadWrite = "rw"
720− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
721868
722869instance FromJSON VolumePermission where
723870 parseJSON "rw" = return ReadWrite
724871 parseJSON "ro" = return ReadOnly
725− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
726875
727876-- | Used for marking a directory in the container as "exposed" hence
728877-- taking it outside of the COW filesystem and making it mountable
@@ -737,15 +886,15 @@ instance FromJSON VolumePermission where
737886-- @
738887newtype Volume = Volume FilePath deriving (Eq, Show)
739888
740−instance ToJSON [Volume] where
741− toJSON [] = JSON.Object HM.empty
742− toJSON (v:vs) = JSON.Object $ foldl f HM.empty (v:vs)
743− where f acc (Volume k) = HM.insert (T.pack k) (JSON.Object HM.empty) acc
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
890+ toJSON [] = emptyJsonObject
891+ toJSON (v:vs) = toJsonKey (v:vs) getKey
892+ where getKey (Volume v) = v
744893
745−instance FromJSON [Volume] where
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
746895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
747− parseJSON (JSON.Null) = return []
748− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
749898
750899
751900data Bind = Bind { hostSrc :: Text
@@ -755,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
755904
756905instance FromJSON Bind where
757906 parseJSON (JSON.String t) = case T.split (== ':') t of
758− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
759908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
760909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
761− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
762911 parseJSON _ = fail "Bind is not a string"
763912
764913data Device = Device {
@@ -781,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
781930
782931instance FromJSON VolumeFrom where
783932 parseJSON (JSON.String t) = case T.split (== ':') t of
784− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
785934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
786935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
787− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
788937 parseJSON _ = fail "VolumeFrom is not a string"
789938
790939instance ToJSON VolumeFrom where
791940 toJSON (VolumeFrom n p) = case p of
792− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
793942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
794943
795944instance ToJSON Bind where
@@ -801,63 +950,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
801950
802951instance FromJSON Link where
803952 parseJSON (JSON.String t) = case T.split (== ':') t of
804− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
805954 [f,s] -> return $ Link f $ Just s
806− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
807956 parseJSON _ = fail "Link is not a string"
808957
809958instance ToJSON Link where
810959 toJSON (Link n1 n2) = toJSON $ case n2 of
811960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
812− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
813962
814963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
815964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
816965
817966instance FromJSON LogDriverType where
818967 parseJSON (JSON.String "json-file") = return JsonFile
819− parseJSON (JSON.String "syslog") = return Syslog
820− parseJSON (JSON.String "journald") = return Journald
821− parseJSON (JSON.String "gelf") = return Gelf
822− parseJSON (JSON.String "fluentd") = return Fluentd
823− parseJSON (JSON.String "awslogs") = return AwsLogs
824− parseJSON (JSON.String "splunk") = return Splunk
825− parseJSON (JSON.String "etwlogs") = return Etwlogs
826− parseJSON (JSON.String "none") = return LoggingDisabled
827− parseJSON _ = fail "Unknown LogDriverType"
968+ parseJSON (JSON.String "syslog") = return Syslog
969+ parseJSON (JSON.String "journald") = return Journald
970+ parseJSON (JSON.String "gelf") = return Gelf
971+ parseJSON (JSON.String "fluentd") = return Fluentd
972+ parseJSON (JSON.String "awslogs") = return AwsLogs
973+ parseJSON (JSON.String "splunk") = return Splunk
974+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975+ parseJSON (JSON.String "none") = return LoggingDisabled
976+ parseJSON _ = fail "Unknown LogDriverType"
828977
829978instance ToJSON LogDriverType where
830− toJSON JsonFile = JSON.String "json-file"
831− toJSON Syslog = JSON.String "syslog"
832− toJSON Journald = JSON.String "journald"
833− toJSON Gelf = JSON.String "gelf"
834− toJSON Fluentd = JSON.String "fluentd"
835− toJSON AwsLogs = JSON.String "awslogs"
836− toJSON Splunk = JSON.String "splunk"
837− toJSON Etwlogs = JSON.String "etwlogs"
979+ toJSON JsonFile = JSON.String "json-file"
980+ toJSON Syslog = JSON.String "syslog"
981+ toJSON Journald = JSON.String "journald"
982+ toJSON Gelf = JSON.String "gelf"
983+ toJSON Fluentd = JSON.String "fluentd"
984+ toJSON AwsLogs = JSON.String "awslogs"
985+ toJSON Splunk = JSON.String "splunk"
986+ toJSON Etwlogs = JSON.String "etwlogs"
838987 toJSON LoggingDisabled = JSON.String "none"
839988
840−newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
989+data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
841990
842−instance FromJSON LogDriverOptions where
843− parseJSON (JSON.Object o) = do
844− LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
991+instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
992+ toJSON [] = emptyJsonObject
993+ toJSON (o:os) = toJsonKeyVal (o:os) key val
994+ where key (LogDriverOption n _) = T.unpack n
995+ val (LogDriverOption _ v) = v
845996
846− where
847− f accM k (JSON.String v) = do
997+instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
998+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999+ where f accM k v = do
8481000 acc <- accM
849− return $ M.insert k v acc
850− f _ _ _ = fail "Value of LogDriverOptions is not a string"
1001+ value <- parseJSON v
1002+ return $ (LogDriverOption k value):acc
1003+ parseJSON JSON.Null = return []
1004+ parseJSON _ = fail "Failed to parse LogDriverOptions"
8511005
852− parseJSON JSON.Null = return $ LogDriverOptions M.empty
853− parseJSON _ = fail "LogDriverOptions is not an object"
854−
855−instance ToJSON LogDriverOptions where
856− toJSON (LogDriverOptions mp) = toJSON mp
857−
858−data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1006+data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
8591007
8601008instance ToJSON LogDriverConfig where
1009+ toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
8611010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
8621011
8631012instance FromJSON LogDriverConfig where
@@ -868,19 +1017,41 @@ instance FromJSON LogDriverConfig where
8681017 parseJSON _ = fail "LogDriverConfig is not an object"
8691018
8701019-- TODO: Add container:<name|id> mode
871−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
8721021 deriving (Eq, Show, Ord)
8731022
8741023instance FromJSON NetworkMode where
875− parseJSON (JSON.String "bridge") = return Bridge
876− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
877− parseJSON (JSON.String "none") = return NetworkDisabled
878− parseJSON _ = fail "Unknown NetworkMode"
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
1026+ parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
1028+ parseJSON _ = fail "Unknown NetworkMode"
8791029
8801030instance ToJSON NetworkMode where
881− toJSON Bridge = JSON.String "bridge"
882− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
8831033 toJSON NetworkDisabled = JSON.String "none"
1034+ toJSON (NetworkNamed n) = JSON.String n
1035+
1036+newtype NetworkID = NetworkID Text
1037+ deriving (Eq, Show)
1038+
1039+-- | Used for extracting the id of the container from the newtype
1040+fromNetworkID :: NetworkID -> Text
1041+fromNetworkID (NetworkID t) = t
1042+
1043+-- | Used for parsing a Text value into a NetworkID.
1044+toNetworkID :: Text -> Maybe NetworkID
1045+toNetworkID t = Just $ NetworkID t
1046+
1047+instance FromJSON NetworkID where
1048+ parseJSON (JSON.Object o) = do
1049+ nid <- o .: "Id"
1050+ return $ NetworkID nid
1051+ parseJSON _ = fail "NetworkID is not an object."
1052+
1053+instance ToJSON NetworkID where
1054+ toJSON (NetworkID nid) = object ["Id" .= nid]
8841055
8851056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
8861057
@@ -896,7 +1067,7 @@ instance FromJSON PortType where
8961067 parseJSON val = case val of
8971068 "tcp" -> return TCP
8981069 "udp" -> return UDP
899− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9001071
9011072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9021073--
@@ -969,7 +1140,15 @@ addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
9691140 where hc = hostConfig c
9701141 pbs = portBindings $ hostConfig c
9711142
972−instance FromJSON [PortBinding] where
1143+-- | Helper function for adding a "ExposedPort" to and existing
1144+-- CreateOpts record.
1145+addExposedPort :: ExposedPort -> CreateOpts -> CreateOpts
1146+addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1147+ where cc = containerConfig c
1148+ oldeps = exposedPorts cc
1149+
1150+
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
9731152 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
9741153 where
9751154 f accM k v = case T.split (== '/') k of
@@ -979,16 +1158,15 @@ instance FromJSON [PortBinding] where
9791158 acc <- accM
9801159 hps <- parseJSON v
9811160 return $ (PortBinding port portType hps):acc
982− _ ->
983− fail "Could not parse PortBindings"
1161+ _ -> fail "Could not parse PortBindings"
1162+ parseJSON (JSON.Null) = return []
9841163 parseJSON _ = fail "PortBindings is not an object"
9851164
986−instance ToJSON [PortBinding] where
987− toJSON [] = JSON.Object HM.empty
988− toJSON (p:ps) = JSON.Object $ foldl f HM.empty (p:ps)
989− where mKey p = portAndType2Text (containerPort p) (portType p)
990− mVal p = toJSON $ hostPorts p
991− f acc p = HM.insert (mKey p) (mVal p) acc
1165+instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1166+ toJSON [] = emptyJsonObject
1167+ toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1168+ where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1169+ val p = hostPorts p
9921170
9931171data HostPort = HostPort {
9941172 hostIp :: Text
@@ -1019,7 +1197,7 @@ instance FromJSON RestartPolicy where
10191197 "on-failure" -> do
10201198 retry <- o .: "MaximumRetryCount"
10211199 return $ RestartOnFailure retry
1022− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10231201 _ -> fail "Could not parse RestartPolicy"
10241202 parseJSON _ = fail "RestartPolicy is not an object"
10251203
@@ -1027,7 +1205,7 @@ instance ToJSON RestartPolicy where
10271205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10281206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
10291207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1030− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
10311209
10321210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
10331211
@@ -1200,6 +1378,22 @@ instance ToJSON DeviceRate where
12001378 , "Rate" .= r
12011379 ]
12021380
1381+data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1382+
1383+data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1384+
1385+instance ToJSON MemoryConstraint where
1386+ toJSON (MemoryConstraint x B) = toJSON x
1387+ toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1388+ toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1389+
1390+instance FromJSON MemoryConstraint where
1391+ parseJSON (JSON.Number x) = case (floatingOrInteger x) of
1392+ Left (_ :: Double) -> fail "Failed to parse MemoryConstraint"
1393+ Right i -> return $ MemoryConstraint i B
1394+ -- The docker daemon will always return the number as bytes (integer), regardless of how we set them (using MB or GB)
1395+ parseJSON _ = fail "Failed to parse MemoryConstraint"
1396+
12031397data ContainerResources = ContainerResources {
12041398 cpuShares :: Maybe Integer
12051399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1215,12 +1409,12 @@ data ContainerResources = ContainerResources {
12151409 , cpusetMems :: Maybe Text
12161410 , devices :: [Device]
12171411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1218− , kernelMemory :: Maybe Integer
1219− , memory :: Maybe Integer
1220− , memoryReservation :: Maybe Integer
1221− , memorySwap :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1413+ , memory :: Maybe MemoryConstraint
1414+ , memoryReservation :: Maybe MemoryConstraint
1415+ , memorySwap :: Maybe MemoryConstraint
12221416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1223− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
12241418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
12251419 , ulimits :: [Ulimit]
12261420 -- TODO: Missing from 1.24
@@ -1258,45 +1452,59 @@ instance FromJSON EnvVar where
12581452 parseJSON _ = fail "EnvVar is not a string"
12591453
12601454instance ToJSON EnvVar where
1261− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
12621456
1263−-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1457+-- | ExposedPort represents a port (and it's type)
12641458-- that a container should expose to other containers or the host system.
1265−-- `NOTE`: This does not automatically expose the ports onto the host
1266−-- system but rather it just tags them. It's best to be used with
1459+-- `NOTE`: This does not automatically expose the port onto the host
1460+-- system but rather it just tags it. It's best to be used with
12671461-- the PublishAllPorts flag. It is also useful for
12681462-- the daemon to know which Environment variables to
12691463-- inject into a container linking to our container.
12701464-- Example linking a Postgres container named db would inject the following
12711465-- environment variables automatically if we set the corresponding
12721466--
1273−-- ExposedPorts:
1467+-- ExposedPort:
12741468--
12751469-- @
12761470-- DB_PORT_5432_TCP_PORT="5432"
12771471-- DB_PORT_5432_TCP_PROTO="tcp"
12781472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
12791473-- @
1280−newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1281−-- JP: Should this be ExposedPorts [(Port, PortType)]?
1282−
1283−instance FromJSON ExposedPorts where
1284− parseJSON (JSON.Object o) = do
1285− ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
1474+data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
12861475
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
12871478 where
12881479 f accM k _ = case T.split (== '/') k of
12891480 [port', portType'] -> do
12901481 port <- parseIntegerText port'
12911482 portType <- parseJSON $ JSON.String portType'
12921483 acc <- accM
1293− return $ M.insert port portType acc
1294− _ ->
1295− fail "Could not parse ExposedPorts"
1296− parseJSON _ = fail "ExposedPorts is not an object."
1484+ return $ (ExposedPort port portType):acc
1485+ _ -> fail "Could not parse ExposedPorts"
1486+ parseJSON (JSON.Null) = return []
1487+ parseJSON _ = fail "ExposedPorts is not an object"
1488+
1489+instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1490+ toJSON [] = emptyJsonObject
1491+ toJSON (p:ps) = toJsonKey (p:ps) key
1492+ where key (ExposedPort p t) = show p <> slash <> show t
1493+ slash = T.unpack "/"
1494+
1495+data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1496+
1497+instance ToJSON Entrypoint where
1498+ toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499+ toJSON (Entrypoint []) = JSON.Null
12971500
1298−instance ToJSON ExposedPorts where
1299− toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
1501+instance FromJSON Entrypoint where
1502+ parseJSON (JSON.String e) = return $ Entrypoint [e]
1503+ parseJSON (JSON.Array ar) = do
1504+ arr <- mapM parseJSON (V.toList ar)
1505+ return $ Entrypoint arr
1506+ parseJSON JSON.Null = return $ Entrypoint []
1507+ parseJSON _ = fail "Failed to parse Entrypoint"
13001508
13011509
13021510data ContainerConfig = ContainerConfig {
@@ -1306,7 +1514,7 @@ data ContainerConfig = ContainerConfig {
13061514 , attachStdin :: Bool
13071515 , attachStdout :: Bool
13081516 , attachStderr :: Bool
1309− , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
1517+ , exposedPorts :: [ExposedPort]
13101518 -- , publishService :: Text -- Don't see this in 1.24
13111519 , tty :: Bool
13121520 , openStdin :: Bool
@@ -1317,25 +1525,68 @@ data ContainerConfig = ContainerConfig {
13171525 , image :: Text
13181526 , volumes :: [Volume]
13191527 , workingDir :: Maybe FilePath
1320− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
13211529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
13221530 , macAddress :: Maybe Text
13231531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1324− , labels :: Maybe Labels
1532+ , labels :: [Label]
13251533 , stopSignal :: Signal
13261534 } deriving (Eq, Show, Generic)
13271535
1536+
13281537instance ToJSON ContainerConfig where
13291538 toJSON = genericToJSON defaultOptions {
13301539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
13311540
13321541instance FromJSON ContainerConfig where
1333− parseJSON = genericParseJSON defaultOptions {
1334− fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1542+ parseJSON (JSON.Object o) = do
1543+ hostname <- o .:? "Hostname"
1544+ domainname <- o .:? "Domainname"
1545+ user <- o .:? "User"
1546+ attachStdin <- o .: "AttachStdin"
1547+ attachStdout <- o .: "AttachStdout"
1548+ attachStderr <- o .: "AttachStderr"
1549+ exposedPorts <- o .:? "ExposedPorts" .!= []
1550+ tty <- o .: "Tty"
1551+ openStdin <- o .: "OpenStdin"
1552+ stdinOnce <- o .: "StdinOnce"
1553+ env <- o .: "Env"
1554+ cmd <- o .: "Cmd"
1555+ image <- o .: "Image"
1556+ volumes <- o .: "Volumes"
1557+ workingDir <- o .:? "WorkingDir"
1558+ entrypoint <- o .: "Entrypoint"
1559+ networkDisabled <- o .:? "networkDisabled"
1560+ macAddress <- o .:? "MacAddress"
1561+ labels <- o .:? "Labels" .!= []
1562+ stopSignal <- o .: "StopSignal"
1563+ return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1564+ macAddress labels stopSignal
1565+ parseJSON _ = fail "NetworkSettings is not an object."
13351566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
13361570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
13371572parseIntegerText t = case readMaybe $ T.unpack t of
13381573 Nothing ->
13391574 fail "Could not parse Integer"
13401575 Just i ->
13411576 return i
1577+
1578+-- | Helper function for converting a data type [a] to a json dictionary
1579+-- like so {"something": {}, "something2": {}}
1580+toJsonKey :: Foldable t => t a -> (a -> String) -> JSON.Value
1581+toJsonKey vs getKey = JSON.Object $ foldl f HM.empty vs
1582+ where f acc x = HM.insert (T.pack $ getKey x) (JSON.Object HM.empty) acc
1583+
1584+-- | Helper function for converting a data type [a] to a json dictionary
1585+-- like so {"something": "val1", "something2": "val2"}
1586+toJsonKeyVal :: (Foldable t, JSON.ToJSON r) => t a -> (a -> String) -> (a -> r) -> JSON.Value
1587+toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1588+ where f acc x = HM.insert (T.pack $ getKey x) (toJSON $ getVal x) acc
1589+
1590+-- | Helper function that return an empty dictionary "{}"
1591+emptyJsonObject :: JSON.Value
1592+emptyJsonObject = JSON.Object HM.empty