@@ -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,17 +58,16 @@ 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(..)
5970 , PortBinding(..)
60− , PortBindings(..)
6171 , HostPort(..)
6272 , RetryCount
6373 , RestartPolicy(..)
@@ -65,6 +75,8 @@ module Docker.Client.Types (
6575 , UTSMode(..)
6676 , HostConfig(..)
6777 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
6880 , Ulimit(..)
6981 , ContainerResources(..)
7082 , defaultContainerResources
@@ -74,15 +86,18 @@ module Docker.Client.Types (
7486 , EnvVar(..)
7587 , ContainerConfig(..)
7688 , defaultContainerConfig
77− , ExposedPorts(..)
89+ , ExposedPort(..)
7890 , DeviceWeight(..)
7991 , DeviceRate(..)
8092 , addPortBinding
93+ , addExposedPort
8194 , addBind
8295 , setCmd
8396 , addLink
8497 , addVolume
8598 , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
86101 ) where
87102
88103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -92,11 +107,12 @@ import qualified Data.Aeson as JSON
92107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
93108import Data.Char (isAlphaNum, toUpper)
94109import qualified Data.HashMap.Strict as HM
95−import qualified Data.Map as M
96110import Data.Monoid ((<>))
111+import Data.Scientific (floatingOrInteger)
97112import Data.Text (Text)
98113import qualified Data.Text as T
99114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
100116import GHC.Generics (Generic)
101117import Prelude hiding (all, tail)
102118import Text.Read (readMaybe)
@@ -109,14 +125,20 @@ data Endpoint =
109125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
110126 | StartContainerEndpoint StartOpts ContainerID
111127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
112129 | KillContainerEndpoint Signal ContainerID
113130 | RestartContainerEndpoint Timeout ContainerID
114131 | PauseContainerEndpoint ContainerID
115132 | UnpauseContainerEndpoint ContainerID
116133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
117134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
118− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
119136 | 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
120142 deriving (Eq, Show)
121143
122144-- | We should newtype this
@@ -163,6 +185,20 @@ toImageID t =
163185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
164186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
165187
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+
166202-- TODO: Add more Signals or use an existing lib
167203-- | Signal used for sending to the process running in the container.
168204-- The default signal is SIGTERM.
@@ -177,16 +213,16 @@ data Signal = SIGHUP
177213
178214instance FromJSON Signal where
179215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
180− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
181− 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
182218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
183219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
184220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
185− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
186222
187223instance ToJSON Signal where
188− toJSON SIGHUP = "SIGHUP"
189− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
190226 toJSON SIGQUIT = "SIGQUIT"
191227 toJSON SIGSTOP = "SIGSTOP"
192228 toJSON SIGTERM = "SIGTERM"
@@ -208,13 +244,13 @@ data ContainerDetails = ContainerDetails {
208244 , containerDetailsId :: ContainerID
209245 , containerDetailsImage :: ImageID
210246 , mountLabel :: Text
211− , names :: [Text]
247+ , name :: Text
212248 , networkSettings :: NetworkSettings
213249 , path :: FilePath
214250 , processLabel :: Text
215251 , resolveConfPath :: FilePath
216252 , restartCount :: Int
217− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
218254 , mounts :: [Mount]
219255 }
220256 deriving (Eq, Show, Generic)
@@ -222,11 +258,11 @@ data ContainerDetails = ContainerDetails {
222258-- | Data type used for parsing the mount information from a container
223259-- list.
224260data Mount = Mount {
225− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
226262 , mountSource :: FilePath
227263 , mountDestination :: FilePath
228− , mountDriver :: Text
229− , mountMode :: Maybe VolumePermission -- apparently this can be null
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
230266 , mountRW :: Bool
231267 , mountPropogation :: Text
232268 }
@@ -234,14 +270,14 @@ data Mount = Mount {
234270
235271instance FromJSON Mount where
236272 parseJSON (JSON.Object o) = do
237− name <- o .: "Name"
273+ name <- o .:? "Name"
238274 src <- o .: "Source"
239275 dest <- o .: "Destination"
240− driver <- o .: "Driver"
241− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
242278 rw <- o .: "RW"
243279 prop <- o .: "Propagation"
244− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
245281 parseJSON _ = fail "Mount is not an object"
246282
247283-- | Data type used for parsing the container state from a list of
@@ -257,7 +293,7 @@ data ContainerState = ContainerState {
257293 , restarting :: Bool
258294 , running :: Bool
259295 , startedAt :: UTCTime
260− , status :: Status
296+ , state :: State
261297 }
262298 deriving (Eq, Show, Generic)
263299
@@ -335,7 +371,7 @@ instance FromJSON ContainerDetails where
335371 id <- parseJSON v
336372 image <- o .: "Image"
337373 mountLabel <- o .: "MountLabel"
338− names <- o .: "Names"
374+ name <- o .: "Name"
339375 networkSettings <- o .: "NetworkSettings"
340376 path <- o .: "Path"
341377 processLabel <- o .: "ProcessLabel"
@@ -343,7 +379,7 @@ instance FromJSON ContainerDetails where
343379 restartCount <- o .: "RestartCount"
344380 state <- o .: "State"
345381 mounts <- o .: "Mounts"
346− return $ ContainerDetails appArmor args config created driver hostConfig hostnamePath hostsPath logPath id image mountLabel names networkSettings path processLabel resolveConfPath restartCount state mounts
382+ return $ ContainerDetails appArmor args config created driver hostConfig hostnamePath hostsPath logPath id image mountLabel name networkSettings path processLabel resolveConfPath restartCount state mounts
347383 parseJSON _ = fail "ContainerDetails is not an object"
348384
349385instance ToJSON ContainerID where
@@ -420,20 +456,17 @@ instance FromJSON NetworkOptions where
420456 parseJSON _ = fail "NetworkOptions is not an object"
421457
422458-- TODO: Not sure what this is used for anymore.
423−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
424460 deriving (Eq, Show)
425461
426−instance FromJSON Networks where
427− parseJSON (JSON.Object o) = do
428− Networks <$> HM.foldlWithKey' f (return M.empty) o
429−
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
463+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
430464 where
431465 f accM k' v' = do
432466 acc <- accM
433467 k <- parseJSON $ JSON.String k'
434468 v <- parseJSON v'
435− return $ M.insert k v acc
436−
469+ return $ (Network k v):acc
437470 parseJSON _ = fail "Networks is not an object"
438471
439472-- | Data type reprsenting the various network settings a container can have.
@@ -443,7 +476,7 @@ data NetworkSettings = NetworkSettings {
443476 , networkSettingsHairpinMode :: Bool
444477 , networkSettingsLinkLocalIPv6Address :: Text
445478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
446− , networkSettingsPorts :: PortBindings
479+ , networkSettingsPorts :: [PortBinding]
447480 , networkSettingsSandboxKey :: Text
448481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
449482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -455,7 +488,7 @@ data NetworkSettings = NetworkSettings {
455488 , networkSettingsIpPrefixLen :: Int
456489 , networkSettingsIpv6Gateway :: Text
457490 , networkSettingsMacAddress :: Text
458− , networkSettingsNetworks :: Networks
491+ , networkSettingsNetworks :: [Network]
459492 }
460493 deriving (Eq, Show)
461494
@@ -490,21 +523,23 @@ data Container = Container
490523 , containerImageId :: ImageID
491524 , containerCommand :: Text
492525 , containerCreatedAt :: Int
493− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
494528 , containerPorts :: [ContainerPortInfo]
495− , containerLabels :: Labels
496− , containerNetworks :: Networks
529+ , containerLabels :: [Label]
530+ , containerNetworks :: [Network]
497531 , containerMounts :: [Mount]
498532 } deriving (Show, Eq)
499533
500534instance FromJSON Container where
501− parseJSON (JSON.Object v) =
502− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
503537 <*> (v .: "Names")
504538 <*> (v .: "Image")
505− <*> (v .: "ImageID")
506− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
507541 <*> (v .: "Created")
542+ <*> (v .: "State")
508543 <*> (v .: "Status")
509544 <*> (v .: "Ports")
510545 <*> (v .: "Labels")
@@ -514,34 +549,45 @@ instance FromJSON Container where
514549 parseNetworks (JSON.Object v) =
515550 (v .: "Networks") >>= parseJSON
516551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
517−
518552 parseJSON _ = fail "Container: Not a JSON object."
519553
520−-- | Represents the status of the container life cycle.
521−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
522556 deriving (Eq, Show, Generic)
523557
524−instance FromJSON Status where
525− parseJSON (JSON.String "running") = return Running
526− 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.
527561 parseJSON (JSON.String "restarting") = return Restarting
528− parseJSON (JSON.String "paused") = return Paused
529− parseJSON (JSON.String "exited") = return Exited
530− parseJSON (JSON.String "dead") = return Dead
531− 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
532566
533567-- | Alias for representing a RepoDigest. We could newtype this and add
534568-- some validation.
535569type Digest = Text
536570
537571-- | Container and Image Labels.
538−newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
572+data Label = Label Name Value deriving (Eq, Show)
573+
539574
540−instance FromJSON Labels where
541− parseJSON val = Labels <$> parseJSON val
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
542582
543−instance ToJSON Labels where
544− toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
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."
545591
546592-- | Alias for Tags.
547593type Tag = Text
@@ -552,10 +598,10 @@ data Image = DockerImage {
552598 , imageCreated :: Integer
553599 , imageParentId :: Maybe ImageID
554600 , imageRepoTags :: [Tag]
555− , imageRepoDigests :: Maybe [Digest]
601+ , imageRepoDigests :: [Digest]
556602 , imageSize :: Integer
557603 , imageVirtualSize :: Integer
558− , imageLabels :: Maybe Labels
604+ , imageLabels :: [Label]
559605 } deriving (Show, Eq, Generic)
560606
561607-- | Helper function used for dropping the "image" prefix when serializing
@@ -563,23 +609,60 @@ data Image = DockerImage {
563609dropImagePrefix :: [a] -> [a]
564610dropImagePrefix = drop 5
565611
612+
566613instance FromJSON Image where
567− parseJSON = genericParseJSON defaultOptions {
568− 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+ ]
569649
570650-- | Options used for creating a Container.
571651data CreateOpts = CreateOpts {
572− containerConfig :: ContainerConfig
573− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
574655 } deriving (Eq, Show)
575656
576657instance ToJSON CreateOpts where
577− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
578659 let ccJSON = toJSON cc
579660 let hcJSON = toJSON hc
580661 case ccJSON of
581662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
582− 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
583666 _ -> error "ContainerConfig is not an object." -- This should never happen.
584667
585668-- | Container configuration used for creating a container with sensible
@@ -593,7 +676,7 @@ defaultContainerConfig imageName = ContainerConfig {
593676 , attachStdout=False
594677 , image=imageName
595678 , attachStderr=False
596− , exposedPorts=Nothing -- ExposedPorts M.empty
679+ , exposedPorts=[]
597680 , tty=False
598681 , openStdin=False
599682 , stdinOnce=False
@@ -601,10 +684,10 @@ defaultContainerConfig imageName = ContainerConfig {
601684 , cmd=[]
602685 , volumes=[]
603686 , workingDir=Nothing
604− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
605688 , networkDisabled=Nothing
606689 , macAddress=Nothing
607− , labels=Nothing
690+ , labels=[]
608691 , stopSignal=SIGTERM
609692 }
610693
@@ -613,9 +696,9 @@ defaultHostConfig :: HostConfig
613696defaultHostConfig = HostConfig {
614697 binds=[]
615698 , containerIDFile=Nothing
616− , logConfig=LogDriverConfig JsonFile Nothing
617− , networkMode=Bridge
618− , portBindings=PortBindings []
699+ , logConfig=LogDriverConfig JsonFile []
700+ , networkMode=NetworkBridge
701+ , portBindings=[]
619702 , restartPolicy=RestartOff
620703 , volumeDriver=Nothing
621704 , volumesFrom=[]
@@ -654,14 +737,18 @@ defaultContainerResources = ContainerResources {
654737 , memory=Nothing
655738 , memoryReservation=Nothing
656739 , memorySwap=Nothing
657− , oomKillDisable=False
740+ , oomKillDisable=Just False
658741 , ulimits=[]
659742 }
660743
661744-- | Default create options when creating a container. You only need to
662745-- specify an image name and the rest is all sensible defaults.
663746defaultCreateOpts :: T.Text -> CreateOpts
664−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+ }
665752
666753-- | Override the key sequence for detaching a container.
667754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -675,16 +762,45 @@ defaultStartOpts :: StartOpts
675762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
676763
677764-- | Options for deleting a container.
678−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
679766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
680767 , force :: Bool -- ^ If the container is still running force deletion anyway.
681768 } deriving (Eq, Show)
682769
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+
683792-- | Default options for deleting a container. Most of the time we DON'T
684793-- want to delete the container's volumes or force delete it if it's
685794-- running.
686−defaultDeleteOpts :: DeleteOpts
687−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
688804
689805-- | Timestamp alias.
690806type Timestamp = Integer
@@ -712,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
712828 , tail = All
713829 }
714830
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+
715861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
716862-- | Set permissions on volumes that you mount in the container.
717863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
718864
719865instance ToJSON VolumePermission where
720866 toJSON ReadWrite = "rw"
721− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
722868
723869instance FromJSON VolumePermission where
724870 parseJSON "rw" = return ReadWrite
725871 parseJSON "ro" = return ReadOnly
726− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
727875
728876-- | Used for marking a directory in the container as "exposed" hence
729877-- taking it outside of the COW filesystem and making it mountable
@@ -738,21 +886,15 @@ instance FromJSON VolumePermission where
738886-- @
739887newtype Volume = Volume FilePath deriving (Eq, Show)
740888
741−instance ToJSON Volume where
742− toJSON (Volume fp) = JSON.Object $ HM.insert (T.pack fp) (JSON.Object HM.empty) HM.empty
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
890+ toJSON [] = emptyJsonObject
891+ toJSON (v:vs) = toJsonKey (v:vs) getKey
892+ where getKey (Volume v) = v
743893
744−instance FromJSON Volume where
745− parseJSON (JSON.Object o) = return $ Volume $ T.unpack $ head $ HM.keys o
746− parseJSON _ = fail "Volume is not an object"
747−
748−instance ToJSON [Volume] where
749− toJSON [] = JSON.Object HM.empty
750− toJSON (v:vs) = JSON.Object $ foldl f HM.empty (v:vs)
751− where f acc (Volume k) = HM.insert (T.pack k) (JSON.Object HM.empty) acc
752−
753−instance FromJSON [Volume] where
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
754895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
755− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
756898
757899
758900data Bind = Bind { hostSrc :: Text
@@ -762,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
762904
763905instance FromJSON Bind where
764906 parseJSON (JSON.String t) = case T.split (== ':') t of
765− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
766908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
767909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
768− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
769911 parseJSON _ = fail "Bind is not a string"
770912
771913data Device = Device {
@@ -788,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
788930
789931instance FromJSON VolumeFrom where
790932 parseJSON (JSON.String t) = case T.split (== ':') t of
791− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
792934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
793935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
794− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
795937 parseJSON _ = fail "VolumeFrom is not a string"
796938
797939instance ToJSON VolumeFrom where
798940 toJSON (VolumeFrom n p) = case p of
799− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
800942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
801943
802944instance ToJSON Bind where
@@ -808,63 +950,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
808950
809951instance FromJSON Link where
810952 parseJSON (JSON.String t) = case T.split (== ':') t of
811− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
812954 [f,s] -> return $ Link f $ Just s
813− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
814956 parseJSON _ = fail "Link is not a string"
815957
816958instance ToJSON Link where
817959 toJSON (Link n1 n2) = toJSON $ case n2 of
818960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
819− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
820962
821963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
822964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
823965
824966instance FromJSON LogDriverType where
825967 parseJSON (JSON.String "json-file") = return JsonFile
826− parseJSON (JSON.String "syslog") = return Syslog
827− parseJSON (JSON.String "journald") = return Journald
828− parseJSON (JSON.String "gelf") = return Gelf
829− parseJSON (JSON.String "fluentd") = return Fluentd
830− parseJSON (JSON.String "awslogs") = return AwsLogs
831− parseJSON (JSON.String "splunk") = return Splunk
832− parseJSON (JSON.String "etwlogs") = return Etwlogs
833− parseJSON (JSON.String "none") = return LoggingDisabled
834− 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"
835977
836978instance ToJSON LogDriverType where
837− toJSON JsonFile = JSON.String "json-file"
838− toJSON Syslog = JSON.String "syslog"
839− toJSON Journald = JSON.String "journald"
840− toJSON Gelf = JSON.String "gelf"
841− toJSON Fluentd = JSON.String "fluentd"
842− toJSON AwsLogs = JSON.String "awslogs"
843− toJSON Splunk = JSON.String "splunk"
844− 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"
845987 toJSON LoggingDisabled = JSON.String "none"
846988
847−newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
989+data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
848990
849−instance FromJSON LogDriverOptions where
850− parseJSON (JSON.Object o) = do
851− 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
852996
853− where
854− 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
8551000 acc <- accM
856− return $ M.insert k v acc
857− 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"
8581005
859− parseJSON JSON.Null = return $ LogDriverOptions M.empty
860− parseJSON _ = fail "LogDriverOptions is not an object"
861−
862−instance ToJSON LogDriverOptions where
863− toJSON (LogDriverOptions mp) = toJSON mp
864−
865−data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1006+data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
8661007
8671008instance ToJSON LogDriverConfig where
1009+ toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
8681010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
8691011
8701012instance FromJSON LogDriverConfig where
@@ -875,19 +1017,41 @@ instance FromJSON LogDriverConfig where
8751017 parseJSON _ = fail "LogDriverConfig is not an object"
8761018
8771019-- TODO: Add container:<name|id> mode
878−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
8791021 deriving (Eq, Show, Ord)
8801022
8811023instance FromJSON NetworkMode where
882− parseJSON (JSON.String "bridge") = return Bridge
883− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
884− parseJSON (JSON.String "none") = return NetworkDisabled
885− 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"
8861029
8871030instance ToJSON NetworkMode where
888− toJSON Bridge = JSON.String "bridge"
889− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
8901033 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]
8911055
8921056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
8931057
@@ -903,7 +1067,7 @@ instance FromJSON PortType where
9031067 parseJSON val = case val of
9041068 "tcp" -> return TCP
9051069 "udp" -> return UDP
906− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9071071
9081072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9091073--
@@ -920,13 +1084,6 @@ instance FromJSON PortType where
9201084-- interface like `127.0.0.1`.
9211085-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
9221086-- instance will only send the last one.
923−newtype PortBindings = PortBindings [PortBinding]
924− deriving (Eq, Show)
925−
926−instance Monoid PortBindings where
927− mempty = PortBindings []
928− mappend (PortBindings p1) (PortBindings p2) = PortBindings (p1 ++ p2)
929−
9301087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
9311088data PortBinding = PortBinding {
9321089 containerPort :: Port
@@ -977,19 +1134,22 @@ addVolumeFrom vf c = c{hostConfig=hc{volumesFrom=oldvfs <> [vf]}}
9771134-- Example:
9781135--
9791136-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
980−-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
1137+-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
9811138addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
982−addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1139+addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
9831140 where hc = hostConfig c
9841141 pbs = portBindings $ hostConfig c
9851142
986−instance ToJSON PortBinding where
987− toJSON (PortBinding {..}) = object [portAndType2Text containerPort portType .= hostPorts]
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
9881149
989−instance FromJSON PortBindings where
990− parseJSON (JSON.Object o) = do
991− PortBindings <$> HM.foldlWithKey' f (return []) o
9921150
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1152+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
9931153 where
9941154 f accM k v = case T.split (== '/') k of
9951155 [port', portType'] -> do
@@ -998,16 +1158,15 @@ instance FromJSON PortBindings where
9981158 acc <- accM
9991159 hps <- parseJSON v
10001160 return $ (PortBinding port portType hps):acc
1001− _ ->
1002− fail "Could not parse PortBindings"
1161+ _ -> fail "Could not parse PortBindings"
1162+ parseJSON (JSON.Null) = return []
10031163 parseJSON _ = fail "PortBindings is not an object"
10041164
1005−instance ToJSON PortBindings where
1006− toJSON (PortBindings []) = JSON.Object HM.empty
1007− toJSON (PortBindings (p:ps)) = JSON.Object $ foldl f HM.empty (p:ps)
1008− where mKey p = portAndType2Text (containerPort p) (portType p)
1009− mVal p = toJSON $ hostPorts p
1010− 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
10111170
10121171data HostPort = HostPort {
10131172 hostIp :: Text
@@ -1038,7 +1197,7 @@ instance FromJSON RestartPolicy where
10381197 "on-failure" -> do
10391198 retry <- o .: "MaximumRetryCount"
10401199 return $ RestartOnFailure retry
1041− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10421201 _ -> fail "Could not parse RestartPolicy"
10431202 parseJSON _ = fail "RestartPolicy is not an object"
10441203
@@ -1046,7 +1205,7 @@ instance ToJSON RestartPolicy where
10461205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10471206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
10481207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1049− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
10501209
10511210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
10521211
@@ -1060,7 +1219,7 @@ data HostConfig = HostConfig
10601219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
10611220 , logConfig :: LogDriverConfig
10621221 , networkMode :: NetworkMode
1063− , portBindings :: PortBindings
1222+ , portBindings :: [PortBinding]
10641223 , restartPolicy :: RestartPolicy
10651224 , volumeDriver :: Maybe Text
10661225 , volumesFrom :: [VolumeFrom]
@@ -1219,6 +1378,22 @@ instance ToJSON DeviceRate where
12191378 , "Rate" .= r
12201379 ]
12211380
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+
12221397data ContainerResources = ContainerResources {
12231398 cpuShares :: Maybe Integer
12241399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1234,12 +1409,12 @@ data ContainerResources = ContainerResources {
12341409 , cpusetMems :: Maybe Text
12351410 , devices :: [Device]
12361411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1237− , kernelMemory :: Maybe Integer
1238− , memory :: Maybe Integer
1239− , memoryReservation :: Maybe Integer
1240− , memorySwap :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1413+ , memory :: Maybe MemoryConstraint
1414+ , memoryReservation :: Maybe MemoryConstraint
1415+ , memorySwap :: Maybe MemoryConstraint
12411416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1242− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
12431418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
12441419 , ulimits :: [Ulimit]
12451420 -- TODO: Missing from 1.24
@@ -1277,45 +1452,59 @@ instance FromJSON EnvVar where
12771452 parseJSON _ = fail "EnvVar is not a string"
12781453
12791454instance ToJSON EnvVar where
1280− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
12811456
1282−-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1457+-- | ExposedPort represents a port (and it's type)
12831458-- that a container should expose to other containers or the host system.
1284−-- `NOTE`: This does not automatically expose the ports onto the host
1285−-- 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
12861461-- the PublishAllPorts flag. It is also useful for
12871462-- the daemon to know which Environment variables to
12881463-- inject into a container linking to our container.
12891464-- Example linking a Postgres container named db would inject the following
12901465-- environment variables automatically if we set the corresponding
12911466--
1292−-- ExposedPorts:
1467+-- ExposedPort:
12931468--
12941469-- @
12951470-- DB_PORT_5432_TCP_PORT="5432"
12961471-- DB_PORT_5432_TCP_PROTO="tcp"
12971472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
12981473-- @
1299−newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1300−-- JP: Should this be ExposedPorts [(Port, PortType)]?
1301−
1302−instance FromJSON ExposedPorts where
1303− parseJSON (JSON.Object o) = do
1304− ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
1474+data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
13051475
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
13061478 where
13071479 f accM k _ = case T.split (== '/') k of
13081480 [port', portType'] -> do
13091481 port <- parseIntegerText port'
13101482 portType <- parseJSON $ JSON.String portType'
13111483 acc <- accM
1312− return $ M.insert port portType acc
1313− _ ->
1314− fail "Could not parse ExposedPorts"
1315− 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
13161500
1317−instance ToJSON ExposedPorts where
1318− 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"
13191508
13201509
13211510data ContainerConfig = ContainerConfig {
@@ -1325,7 +1514,7 @@ data ContainerConfig = ContainerConfig {
13251514 , attachStdin :: Bool
13261515 , attachStdout :: Bool
13271516 , attachStderr :: Bool
1328− , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
1517+ , exposedPorts :: [ExposedPort]
13291518 -- , publishService :: Text -- Don't see this in 1.24
13301519 , tty :: Bool
13311520 , openStdin :: Bool
@@ -1336,25 +1525,68 @@ data ContainerConfig = ContainerConfig {
13361525 , image :: Text
13371526 , volumes :: [Volume]
13381527 , workingDir :: Maybe FilePath
1339− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
13401529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
13411530 , macAddress :: Maybe Text
13421531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1343− , labels :: Maybe Labels
1532+ , labels :: [Label]
13441533 , stopSignal :: Signal
13451534 } deriving (Eq, Show, Generic)
13461535
1536+
13471537instance ToJSON ContainerConfig where
13481538 toJSON = genericToJSON defaultOptions {
13491539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
13501540
13511541instance FromJSON ContainerConfig where
1352− parseJSON = genericParseJSON defaultOptions {
1353− 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."
13541566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
13551570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
13561572parseIntegerText t = case readMaybe $ T.unpack t of
13571573 Nothing ->
13581574 fail "Could not parse Integer"
13591575 Just i ->
13601576 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