@@ -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
2731 , 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(..)
@@ -64,6 +75,8 @@ module Docker.Client.Types (
6475 , UTSMode(..)
6576 , HostConfig(..)
6677 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
6780 , Ulimit(..)
6881 , ContainerResources(..)
6982 , defaultContainerResources
@@ -83,6 +96,8 @@ module Docker.Client.Types (
8396 , addLink
8497 , addVolume
8598 , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
86101 ) where
87102
88103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -93,9 +108,11 @@ import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
93108import Data.Char (isAlphaNum, toUpper)
94109import qualified Data.HashMap.Strict as HM
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
@@ -422,7 +459,7 @@ instance FromJSON NetworkOptions where
422459data Network = Network NetworkMode NetworkOptions
423460 deriving (Eq, Show)
424461
425−instance FromJSON [Network] where
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
426463 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
427464 where
428465 f accM k' v' = do
@@ -486,7 +523,8 @@ data Container = Container
486523 , containerImageId :: ImageID
487524 , containerCommand :: Text
488525 , containerCreatedAt :: Int
489− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
490528 , containerPorts :: [ContainerPortInfo]
491529 , containerLabels :: [Label]
492530 , containerNetworks :: [Network]
@@ -494,13 +532,14 @@ data Container = Container
494532 } deriving (Show, Eq)
495533
496534instance FromJSON Container where
497− parseJSON (JSON.Object v) =
498− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
499537 <*> (v .: "Names")
500538 <*> (v .: "Image")
501− <*> (v .: "ImageID")
502− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
503541 <*> (v .: "Created")
542+ <*> (v .: "State")
504543 <*> (v .: "Status")
505544 <*> (v .: "Ports")
506545 <*> (v .: "Labels")
@@ -510,21 +549,20 @@ instance FromJSON Container where
510549 parseNetworks (JSON.Object v) =
511550 (v .: "Networks") >>= parseJSON
512551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
513−
514552 parseJSON _ = fail "Container: Not a JSON object."
515553
516−-- | Represents the status of the container life cycle.
517−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
518556 deriving (Eq, Show, Generic)
519557
520−instance FromJSON Status where
521− parseJSON (JSON.String "running") = return Running
522− 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.
523561 parseJSON (JSON.String "restarting") = return Restarting
524− parseJSON (JSON.String "paused") = return Paused
525− parseJSON (JSON.String "exited") = return Exited
526− parseJSON (JSON.String "dead") = return Dead
527− 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
528566
529567-- | Alias for representing a RepoDigest. We could newtype this and add
530568-- some validation.
@@ -536,13 +574,13 @@ data Label = Label Name Value deriving (Eq, Show)
536574
537575-- If there are multiple lables with the same Name in the list
538576-- then the last one wins.
539−instance ToJSON [Label] where
577+instance {-# OVERLAPPING #-} ToJSON [Label] where
540578 toJSON [] = emptyJsonObject
541579 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
542580 where key (Label k _) = T.unpack k
543581 val (Label _ v) = v
544582
545−instance FromJSON [Label] where
583+instance {-# OVERLAPPING #-} FromJSON [Label] where
546584 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
547585 where f accM k v = do
548586 acc <- accM
@@ -559,8 +597,8 @@ data Image = DockerImage {
559597 imageId :: ImageID
560598 , imageCreated :: Integer
561599 , imageParentId :: Maybe ImageID
562− , imageRepoTags :: Maybe [Tag]
563− , imageRepoDigests :: Maybe [Digest]
600+ , imageRepoTags :: [Tag]
601+ , imageRepoDigests :: [Digest]
564602 , imageSize :: Integer
565603 , imageVirtualSize :: Integer
566604 , imageLabels :: [Label]
@@ -577,30 +615,54 @@ instance FromJSON Image where
577615 imageId <- o .: "Id"
578616 imageCreated <- o .: "Created"
579617 imageParentId <- o .:? "ParentId"
580− imageRepoTags <- o .:? "RepoTags"
581− imageRepoDigests <- o .:? "RepoDigests"
618+ imageRepoTags <- o .:? "RepoTags" .!= []
619+ imageRepoDigests <- o .:? "RepoDigests" .!= []
582620 imageSize <- o .: "Size"
583621 imageVirtualSize <- o .: "VirtualSize"
584− imageLabels <- case HM.lookup "Labels" o of
585− Just ls -> parseJSON ls
586− Nothing -> return []
622+ imageLabels <- o .:? "Labels" .!= []
587623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
588624 parseJSON _ = fail "Failed to parse DockerImage."
589625
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+ ]
590649
591650-- | Options used for creating a Container.
592651data CreateOpts = CreateOpts {
593− containerConfig :: ContainerConfig
594− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
595655 } deriving (Eq, Show)
596656
597657instance ToJSON CreateOpts where
598− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
599659 let ccJSON = toJSON cc
600660 let hcJSON = toJSON hc
601661 case ccJSON of
602662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
603− 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
604666 _ -> error "ContainerConfig is not an object." -- This should never happen.
605667
606668-- | Container configuration used for creating a container with sensible
@@ -622,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
622684 , cmd=[]
623685 , volumes=[]
624686 , workingDir=Nothing
625− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
626688 , networkDisabled=Nothing
627689 , macAddress=Nothing
628690 , labels=[]
@@ -635,7 +697,7 @@ defaultHostConfig = HostConfig {
635697 binds=[]
636698 , containerIDFile=Nothing
637699 , logConfig=LogDriverConfig JsonFile []
638− , networkMode=Bridge
700+ , networkMode=NetworkBridge
639701 , portBindings=[]
640702 , restartPolicy=RestartOff
641703 , volumeDriver=Nothing
@@ -675,14 +737,18 @@ defaultContainerResources = ContainerResources {
675737 , memory=Nothing
676738 , memoryReservation=Nothing
677739 , memorySwap=Nothing
678− , oomKillDisable=False
740+ , oomKillDisable=Just False
679741 , ulimits=[]
680742 }
681743
682744-- | Default create options when creating a container. You only need to
683745-- specify an image name and the rest is all sensible defaults.
684746defaultCreateOpts :: T.Text -> CreateOpts
685−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+ }
686752
687753-- | Override the key sequence for detaching a container.
688754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -696,16 +762,45 @@ defaultStartOpts :: StartOpts
696762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
697763
698764-- | Options for deleting a container.
699−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
700766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
701767 , force :: Bool -- ^ If the container is still running force deletion anyway.
702768 } deriving (Eq, Show)
703769
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+
704792-- | Default options for deleting a container. Most of the time we DON'T
705793-- want to delete the container's volumes or force delete it if it's
706794-- running.
707−defaultDeleteOpts :: DeleteOpts
708−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
709804
710805-- | Timestamp alias.
711806type Timestamp = Integer
@@ -733,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
733828 , tail = All
734829 }
735830
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+
736861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
737862-- | Set permissions on volumes that you mount in the container.
738863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
739864
740865instance ToJSON VolumePermission where
741866 toJSON ReadWrite = "rw"
742− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
743868
744869instance FromJSON VolumePermission where
745870 parseJSON "rw" = return ReadWrite
746871 parseJSON "ro" = return ReadOnly
747− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
748875
749876-- | Used for marking a directory in the container as "exposed" hence
750877-- taking it outside of the COW filesystem and making it mountable
@@ -759,15 +886,15 @@ instance FromJSON VolumePermission where
759886-- @
760887newtype Volume = Volume FilePath deriving (Eq, Show)
761888
762−instance ToJSON [Volume] where
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
763890 toJSON [] = emptyJsonObject
764891 toJSON (v:vs) = toJsonKey (v:vs) getKey
765892 where getKey (Volume v) = v
766893
767−instance FromJSON [Volume] where
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
768895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
769− parseJSON (JSON.Null) = return []
770− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
771898
772899
773900data Bind = Bind { hostSrc :: Text
@@ -777,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
777904
778905instance FromJSON Bind where
779906 parseJSON (JSON.String t) = case T.split (== ':') t of
780− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
781908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
782909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
783− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
784911 parseJSON _ = fail "Bind is not a string"
785912
786913data Device = Device {
@@ -803,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
803930
804931instance FromJSON VolumeFrom where
805932 parseJSON (JSON.String t) = case T.split (== ':') t of
806− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
807934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
808935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
809− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
810937 parseJSON _ = fail "VolumeFrom is not a string"
811938
812939instance ToJSON VolumeFrom where
813940 toJSON (VolumeFrom n p) = case p of
814− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
815942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
816943
817944instance ToJSON Bind where
@@ -823,51 +950,51 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
823950
824951instance FromJSON Link where
825952 parseJSON (JSON.String t) = case T.split (== ':') t of
826− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
827954 [f,s] -> return $ Link f $ Just s
828− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
829956 parseJSON _ = fail "Link is not a string"
830957
831958instance ToJSON Link where
832959 toJSON (Link n1 n2) = toJSON $ case n2 of
833960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
834− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
835962
836963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
837964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
838965
839966instance FromJSON LogDriverType where
840967 parseJSON (JSON.String "json-file") = return JsonFile
841− parseJSON (JSON.String "syslog") = return Syslog
842− parseJSON (JSON.String "journald") = return Journald
843− parseJSON (JSON.String "gelf") = return Gelf
844− parseJSON (JSON.String "fluentd") = return Fluentd
845− parseJSON (JSON.String "awslogs") = return AwsLogs
846− parseJSON (JSON.String "splunk") = return Splunk
847− parseJSON (JSON.String "etwlogs") = return Etwlogs
848− parseJSON (JSON.String "none") = return LoggingDisabled
849− 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"
850977
851978instance ToJSON LogDriverType where
852− toJSON JsonFile = JSON.String "json-file"
853− toJSON Syslog = JSON.String "syslog"
854− toJSON Journald = JSON.String "journald"
855− toJSON Gelf = JSON.String "gelf"
856− toJSON Fluentd = JSON.String "fluentd"
857− toJSON AwsLogs = JSON.String "awslogs"
858− toJSON Splunk = JSON.String "splunk"
859− 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"
860987 toJSON LoggingDisabled = JSON.String "none"
861988
862989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
863990
864−instance ToJSON [LogDriverOption] where
991+instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
865992 toJSON [] = emptyJsonObject
866993 toJSON (o:os) = toJsonKeyVal (o:os) key val
867994 where key (LogDriverOption n _) = T.unpack n
868995 val (LogDriverOption _ v) = v
869996
870−instance FromJSON [LogDriverOption] where
997+instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
871998 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
872999 where f accM k v = do
8731000 acc <- accM
@@ -890,19 +1017,41 @@ instance FromJSON LogDriverConfig where
8901017 parseJSON _ = fail "LogDriverConfig is not an object"
8911018
8921019-- TODO: Add container:<name|id> mode
893−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
8941021 deriving (Eq, Show, Ord)
8951022
8961023instance FromJSON NetworkMode where
897− parseJSON (JSON.String "bridge") = return Bridge
898− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
899− parseJSON (JSON.String "none") = return NetworkDisabled
900− 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"
9011029
9021030instance ToJSON NetworkMode where
903− toJSON Bridge = JSON.String "bridge"
904− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
9051033 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]
9061055
9071056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9081057
@@ -918,7 +1067,7 @@ instance FromJSON PortType where
9181067 parseJSON val = case val of
9191068 "tcp" -> return TCP
9201069 "udp" -> return UDP
921− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9221071
9231072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9241073--
@@ -999,7 +1148,7 @@ addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
9991148 oldeps = exposedPorts cc
10001149
10011150
1002−instance FromJSON [PortBinding] where
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
10031152 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
10041153 where
10051154 f accM k v = case T.split (== '/') k of
@@ -1013,7 +1162,7 @@ instance FromJSON [PortBinding] where
10131162 parseJSON (JSON.Null) = return []
10141163 parseJSON _ = fail "PortBindings is not an object"
10151164
1016−instance ToJSON [PortBinding] where
1165+instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
10171166 toJSON [] = emptyJsonObject
10181167 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
10191168 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
@@ -1048,7 +1197,7 @@ instance FromJSON RestartPolicy where
10481197 "on-failure" -> do
10491198 retry <- o .: "MaximumRetryCount"
10501199 return $ RestartOnFailure retry
1051− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10521201 _ -> fail "Could not parse RestartPolicy"
10531202 parseJSON _ = fail "RestartPolicy is not an object"
10541203
@@ -1056,7 +1205,7 @@ instance ToJSON RestartPolicy where
10561205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10571206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
10581207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1059− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
10601209
10611210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
10621211
@@ -1229,6 +1378,22 @@ instance ToJSON DeviceRate where
12291378 , "Rate" .= r
12301379 ]
12311380
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+
12321397data ContainerResources = ContainerResources {
12331398 cpuShares :: Maybe Integer
12341399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1244,12 +1409,12 @@ data ContainerResources = ContainerResources {
12441409 , cpusetMems :: Maybe Text
12451410 , devices :: [Device]
12461411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1247− , kernelMemory :: Maybe Integer
1248− , memory :: Maybe Integer
1249− , memoryReservation :: Maybe Integer
1250− , memorySwap :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1413+ , memory :: Maybe MemoryConstraint
1414+ , memoryReservation :: Maybe MemoryConstraint
1415+ , memorySwap :: Maybe MemoryConstraint
12511416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1252− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
12531418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
12541419 , ulimits :: [Ulimit]
12551420 -- TODO: Missing from 1.24
@@ -1287,7 +1452,7 @@ instance FromJSON EnvVar where
12871452 parseJSON _ = fail "EnvVar is not a string"
12881453
12891454instance ToJSON EnvVar where
1290− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
12911456
12921457-- | ExposedPort represents a port (and it's type)
12931458-- that a container should expose to other containers or the host system.
@@ -1308,7 +1473,7 @@ instance ToJSON EnvVar where
13081473-- @
13091474data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
13101475
1311−instance FromJSON [ExposedPort] where
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
13121477 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
13131478 where
13141479 f accM k _ = case T.split (== '/') k of
@@ -1321,12 +1486,27 @@ instance FromJSON [ExposedPort] where
13211486 parseJSON (JSON.Null) = return []
13221487 parseJSON _ = fail "ExposedPorts is not an object"
13231488
1324−instance ToJSON [ExposedPort] where
1489+instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
13251490 toJSON [] = emptyJsonObject
13261491 toJSON (p:ps) = toJsonKey (p:ps) key
13271492 where key (ExposedPort p t) = show p <> slash <> show t
13281493 slash = T.unpack "/"
13291494
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
1500+
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"
1508+
1509+
13301510data ContainerConfig = ContainerConfig {
13311511 hostname :: Maybe Text
13321512 , domainname :: Maybe Text
@@ -1345,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
13451525 , image :: Text
13461526 , volumes :: [Volume]
13471527 , workingDir :: Maybe FilePath
1348− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
13491529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
13501530 , macAddress :: Maybe Text
13511531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1353,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
13531533 , stopSignal :: Signal
13541534 } deriving (Eq, Show, Generic)
13551535
1536+
13561537instance ToJSON ContainerConfig where
13571538 toJSON = genericToJSON defaultOptions {
13581539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1365,9 +1546,7 @@ instance FromJSON ContainerConfig where
13651546 attachStdin <- o .: "AttachStdin"
13661547 attachStdout <- o .: "AttachStdout"
13671548 attachStderr <- o .: "AttachStderr"
1368− exposedPorts <- case HM.lookup "ExposedPorts" o of
1369− Just eps -> parseJSON eps
1370− Nothing -> return []
1549+ exposedPorts <- o .:? "ExposedPorts" .!= []
13711550 tty <- o .: "Tty"
13721551 openStdin <- o .: "OpenStdin"
13731552 stdinOnce <- o .: "StdinOnce"
@@ -1376,18 +1555,20 @@ instance FromJSON ContainerConfig where
13761555 image <- o .: "Image"
13771556 volumes <- o .: "Volumes"
13781557 workingDir <- o .:? "WorkingDir"
1379− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
13801559 networkDisabled <- o .:? "networkDisabled"
13811560 macAddress <- o .:? "MacAddress"
1382− labels <- case HM.lookup "Labels" o of
1383− Just ls -> parseJSON ls
1384− Nothing -> return []
1561+ labels <- o .:? "Labels" .!= []
13851562 stopSignal <- o .: "StopSignal"
13861563 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
13871564 macAddress labels stopSignal
13881565 parseJSON _ = fail "NetworkSettings is not an object."
13891566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
13901570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
13911572parseIntegerText t = case readMaybe $ T.unpack t of
13921573 Nothing ->
13931574 fail "Could not parse Integer"
@@ -1409,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
14091590-- | Helper function that return an empty dictionary "{}"
14101591emptyJsonObject :: JSON.Value
14111592emptyJsonObject = JSON.Object HM.empty
1412−