@@ -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,41 +26,48 @@ 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(..)
54+ , Bind(..)
4355 , Volume(..)
4456 , Device(..)
4557 , ContainerName
4658 , VolumeFrom(..)
4759 , Link(..)
4860 , LogDriverType(..)
49− , LogDriverOptions(..)
61+ , LogDriverOption(..)
5062 , LogDriverConfig(..)
5163 , NetworkMode(..)
5264 , PortType(..)
5365-- , NetworkInterface(..)
54− , Networks(..)
66+ , Network(..)
5567 , NetworkSettings(..)
5668 , NetworkOptions(..)
5769 , Mount(..)
5870 , PortBinding(..)
59− , PortBindings(..)
6071 , HostPort(..)
6172 , RetryCount
6273 , RestartPolicy(..)
@@ -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,10 +86,18 @@ module Docker.Client.Types (
7386 , EnvVar(..)
7487 , ContainerConfig(..)
7588 , defaultContainerConfig
76− , ExposedPorts(..)
89+ , ExposedPort(..)
7790 , DeviceWeight(..)
7891 , DeviceRate(..)
7992 , addPortBinding
93+ , addExposedPort
94+ , addBind
95+ , setCmd
96+ , addLink
97+ , addVolume
98+ , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
80101 ) where
81102
82103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -86,40 +107,57 @@ import qualified Data.Aeson as JSON
86107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
87108import Data.Char (isAlphaNum, toUpper)
88109import qualified Data.HashMap.Strict as HM
89−import qualified Data.Map as M
90110import Data.Monoid ((<>))
111+import Data.Scientific (floatingOrInteger)
91112import Data.Text (Text)
92113import qualified Data.Text as T
93114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
94116import GHC.Generics (Generic)
95117import Prelude hiding (all, tail)
96118import Text.Read (readMaybe)
97119
120+-- | List of Docker Engine API endpoints
98121data Endpoint =
99122 VersionEndpoint
100123 | ListContainersEndpoint ListOpts
101124 | ListImagesEndpoint ListOpts
102− | CreateContainerEndpoint CreateOpts
125+ | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
103126 | StartContainerEndpoint StartOpts ContainerID
104127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
105129 | KillContainerEndpoint Signal ContainerID
106130 | RestartContainerEndpoint Timeout ContainerID
107131 | PauseContainerEndpoint ContainerID
108132 | UnpauseContainerEndpoint ContainerID
109133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
110134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
111− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
112136 | 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
113142 deriving (Eq, Show)
114143
144+-- | We should newtype this
115145type URL = Text
146+
147+-- | We should newtype this
116148type ApiVersion = Text
149+
150+
151+-- | ID of a contianer
117152newtype ContainerID = ContainerID Text
118153 deriving (Eq, Show)
119154
155+-- | Used for extracting the id of the container from the newtype
120156fromContainerID :: ContainerID -> Text
121157fromContainerID (ContainerID t) = t
122158
159+-- | Used for parsing a Text value into a ContainerID. We apply some basic
160+-- validation here.
123161toContainerID :: Text -> Maybe ContainerID
124162toContainerID t =
125163 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -127,12 +165,16 @@ toContainerID t =
127165 else
128166 Nothing
129167
168+-- ID of an image.
130169newtype ImageID = ImageID Text
131170 deriving (Eq, Show)
132171
172+-- | Used for extracting the id of the image from the newtype.
133173fromImageID :: ImageID -> Text
134174fromImageID (ImageID t) = t
135175
176+-- | Helper function used for parsing a Text value into an ImageID. For now
177+-- just basic validation is used.
136178toImageID :: Text -> Maybe ImageID
137179toImageID t =
138180 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -140,9 +182,26 @@ toImageID t =
140182 else
141183 Nothing
142184
185+-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
143186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
144187
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+
145202-- TODO: Add more Signals or use an existing lib
203+-- | Signal used for sending to the process running in the container.
204+-- The default signal is SIGTERM.
146205data Signal = SIGHUP
147206 | SIGINT
148207 | SIGQUIT
@@ -154,16 +213,16 @@ data Signal = SIGHUP
154213
155214instance FromJSON Signal where
156215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
157− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
158− 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
159218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
160219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
161220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
162− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
163222
164223instance ToJSON Signal where
165− toJSON SIGHUP = "SIGHUP"
166− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
167226 toJSON SIGQUIT = "SIGQUIT"
168227 toJSON SIGSTOP = "SIGSTOP"
169228 toJSON SIGTERM = "SIGTERM"
@@ -191,17 +250,19 @@ data ContainerDetails = ContainerDetails {
191250 , processLabel :: Text
192251 , resolveConfPath :: FilePath
193252 , restartCount :: Int
194− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
195254 , mounts :: [Mount]
196255 }
197256 deriving (Eq, Show, Generic)
198257
258+-- | Data type used for parsing the mount information from a container
259+-- list.
199260data Mount = Mount {
200− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
201262 , mountSource :: FilePath
202263 , mountDestination :: FilePath
203− , mountDriver :: Text
204− , mountMode :: Text -- Note: Improve this?
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
205266 , mountRW :: Bool
206267 , mountPropogation :: Text
207268 }
@@ -209,16 +270,18 @@ data Mount = Mount {
209270
210271instance FromJSON Mount where
211272 parseJSON (JSON.Object o) = do
212− name <- o .: "Name"
273+ name <- o .:? "Name"
213274 src <- o .: "Source"
214275 dest <- o .: "Destination"
215− driver <- o .: "Driver"
216− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
217278 rw <- o .: "RW"
218279 prop <- o .: "Propagation"
219− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
220281 parseJSON _ = fail "Mount is not an object"
221282
283+-- | Data type used for parsing the container state from a list of
284+-- containers.
222285data ContainerState = ContainerState {
223286 containerError :: Text
224287 , exitCode :: Int
@@ -230,7 +293,7 @@ data ContainerState = ContainerState {
230293 , restarting :: Bool
231294 , running :: Bool
232295 , startedAt :: UTCTime
233− , status :: Status
296+ , state :: State
234297 }
235298 deriving (Eq, Show, Generic)
236299
@@ -250,23 +313,30 @@ instance FromJSON ContainerState where
250313 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
251314 parseJSON _ = fail "ContainerState is not an object"
252315
316+
317+-- | Client options used to configure the remote engine we're talking to
253318data DockerClientOpts = DockerClientOpts {
254319 apiVer :: ApiVersion
255320 , baseUrl :: URL
256321 }
257322 deriving (Eq, Show)
258323
324+-- | Default "DockerClientOpts" used for talking to the docker engine.
259325defaultClientOpts :: DockerClientOpts
260326defaultClientOpts = DockerClientOpts {
261327 apiVer = "v1.24"
262328 , baseUrl = "http://127.0.0.1:2375"
263329 }
264330
331+-- | List options used for filtering the list of container or images.
265332data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
266333
334+-- | Default "ListOpts". Doesn't list stopped containers.
267335defaultListOpts :: ListOpts
268336defaultListOpts = ListOpts { all=False }
269337
338+-- | Data type used for represneting the version of the docker engine
339+-- remote API.
270340data DockerVersion = DockerVersion {
271341 version :: Text
272342 , apiVersion :: ApiVersion
@@ -336,6 +406,8 @@ instance FromJSON ImageID where
336406 return iid
337407 parseJSON _ = fail "ImageID is not an object."
338408
409+-- | Data type used for representing the information of various ports that
410+-- a contianer may expose.
339411data ContainerPortInfo = ContainerPortInfo {
340412 ipAddressInfo :: Maybe Text
341413 , privatePortInfo :: Port
@@ -352,6 +424,8 @@ instance FromJSON ContainerPortInfo where
352424 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
353425
354426-- For inspecting container details.
427+-- | Data type used for parsing the network information of each container
428+-- when listing them.
355429data NetworkOptions = NetworkOptions {
356430-- ipamConfig :: Maybe Text -- Don't see in 1.24
357431-- , links :: Maybe Text -- Don't see in 1.24
@@ -381,29 +455,28 @@ instance FromJSON NetworkOptions where
381455 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
382456 parseJSON _ = fail "NetworkOptions is not an object"
383457
384−newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
458+-- TODO: Not sure what this is used for anymore.
459+data Network = Network NetworkMode NetworkOptions
385460 deriving (Eq, Show)
386461
387−instance FromJSON Networks where
388− parseJSON (JSON.Object o) = do
389− Networks <$> HM.foldlWithKey' f (return M.empty) o
390−
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
463+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
391464 where
392465 f accM k' v' = do
393466 acc <- accM
394467 k <- parseJSON $ JSON.String k'
395468 v <- parseJSON v'
396− return $ M.insert k v acc
397−
469+ return $ (Network k v):acc
398470 parseJSON _ = fail "Networks is not an object"
399471
472+-- | Data type reprsenting the various network settings a container can have.
400473data NetworkSettings = NetworkSettings {
401474 networkSettingsBridge :: Text
402475 , networkSettingsSandboxId :: Text
403476 , networkSettingsHairpinMode :: Bool
404477 , networkSettingsLinkLocalIPv6Address :: Text
405478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
406− , networkSettingsPorts :: PortBindings
479+ , networkSettingsPorts :: [PortBinding]
407480 , networkSettingsSandboxKey :: Text
408481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
409482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -415,7 +488,7 @@ data NetworkSettings = NetworkSettings {
415488 , networkSettingsIpPrefixLen :: Int
416489 , networkSettingsIpv6Gateway :: Text
417490 , networkSettingsMacAddress :: Text
418− , networkSettingsNetworks :: Networks
491+ , networkSettingsNetworks :: [Network]
419492 }
420493 deriving (Eq, Show)
421494
@@ -442,6 +515,7 @@ instance FromJSON NetworkSettings where
442515 return $ NetworkSettings bridge sandbox hairpin localIP6 localIP6Len ports sandboxKey secondaryIP secondayIP6 endpointID gateway globalIP6 globalIP6Len ip ipLen ip6Gateway mac networks
443516 parseJSON _ = fail "NetworkSettings is not an object."
444517
518+-- | Data type used for parsing a list of containers.
445519data Container = Container
446520 { containerId :: ContainerID
447521 , containerNames :: [Text]
@@ -449,21 +523,23 @@ data Container = Container
449523 , containerImageId :: ImageID
450524 , containerCommand :: Text
451525 , containerCreatedAt :: Int
452− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
453528 , containerPorts :: [ContainerPortInfo]
454− , containerLabels :: Labels
455− , containerNetworks :: Networks
529+ , containerLabels :: [Label]
530+ , containerNetworks :: [Network]
456531 , containerMounts :: [Mount]
457532 } deriving (Show, Eq)
458533
459534instance FromJSON Container where
460− parseJSON (JSON.Object v) =
461− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
462537 <*> (v .: "Names")
463538 <*> (v .: "Image")
464− <*> (v .: "ImageID")
465− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
466541 <*> (v .: "Created")
542+ <*> (v .: "State")
467543 <*> (v .: "Status")
468544 <*> (v .: "Ports")
469545 <*> (v .: "Labels")
@@ -473,65 +549,124 @@ instance FromJSON Container where
473549 parseNetworks (JSON.Object v) =
474550 (v .: "Networks") >>= parseJSON
475551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
476−
477552 parseJSON _ = fail "Container: Not a JSON object."
478553
479−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
480556 deriving (Eq, Show, Generic)
481557
482−instance FromJSON Status where
483− parseJSON (JSON.String "running") = return Running
484− 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.
485561 parseJSON (JSON.String "restarting") = return Restarting
486− parseJSON (JSON.String "paused") = return Paused
487− parseJSON (JSON.String "exited") = return Exited
488− parseJSON (JSON.String "dead") = return Dead
489− 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
490566
567+-- | Alias for representing a RepoDigest. We could newtype this and add
568+-- some validation.
491569type Digest = Text
492570
493−newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
571+-- | Container and Image Labels.
572+data Label = Label Name Value deriving (Eq, Show)
494573
495−instance FromJSON Labels where
496− parseJSON val = Labels <$> parseJSON val
497574
498−instance ToJSON Labels where
499− 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
500582
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."
591+
592+-- | Alias for Tags.
501593type Tag = Text
502594
595+-- | Data type used for parsing information from a list of images.
503596data Image = DockerImage {
504597 imageId :: ImageID
505598 , imageCreated :: Integer
506599 , imageParentId :: Maybe ImageID
507600 , imageRepoTags :: [Tag]
508− , imageRepoDigests :: Maybe [Digest]
601+ , imageRepoDigests :: [Digest]
509602 , imageSize :: Integer
510603 , imageVirtualSize :: Integer
511− , imageLabels :: Maybe Labels
604+ , imageLabels :: [Label]
512605 } deriving (Show, Eq, Generic)
513606
607+-- | Helper function used for dropping the "image" prefix when serializing
608+-- the Image data type to and from json.
514609dropImagePrefix :: [a] -> [a]
515610dropImagePrefix = drop 5
516611
517−instance FromJSON Image where
518− parseJSON = genericParseJSON defaultOptions {
519− fieldLabelModifier = dropImagePrefix}
520612
613+instance FromJSON Image where
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+ ]
649+
650+-- | Options used for creating a Container.
521651data CreateOpts = CreateOpts {
522− containerConfig :: ContainerConfig
523− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
524655 } deriving (Eq, Show)
525656
526657instance ToJSON CreateOpts where
527− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
528659 let ccJSON = toJSON cc
529660 let hcJSON = toJSON hc
530661 case ccJSON of
531662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
532− 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
533666 _ -> error "ContainerConfig is not an object." -- This should never happen.
534667
668+-- | Container configuration used for creating a container with sensible
669+-- defaults.
535670defaultContainerConfig :: Text -> ContainerConfig
536671defaultContainerConfig imageName = ContainerConfig {
537672 hostname=Nothing
@@ -541,28 +676,29 @@ defaultContainerConfig imageName = ContainerConfig {
541676 , attachStdout=False
542677 , image=imageName
543678 , attachStderr=False
544− , exposedPorts=Nothing -- ExposedPorts M.empty
679+ , exposedPorts=[]
545680 , tty=False
546681 , openStdin=False
547682 , stdinOnce=False
548683 , env=[]
549684 , cmd=[]
550− , volumes=Nothing
685+ , volumes=[]
551686 , workingDir=Nothing
552− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
553688 , networkDisabled=Nothing
554689 , macAddress=Nothing
555− , labels=Nothing
690+ , labels=[]
556691 , stopSignal=SIGTERM
557692 }
558693
694+-- | Default host confiratuon used for creating a container.
559695defaultHostConfig :: HostConfig
560696defaultHostConfig = HostConfig {
561697 binds=[]
562698 , containerIDFile=Nothing
563− , logConfig=LogDriverConfig JsonFile Nothing
564− , networkMode=Bridge
565− , portBindings=PortBindings []
699+ , logConfig=LogDriverConfig JsonFile []
700+ , networkMode=NetworkBridge
701+ , portBindings=[]
566702 , restartPolicy=RestartOff
567703 , volumeDriver=Nothing
568704 , volumesFrom=[]
@@ -583,6 +719,7 @@ defaultHostConfig = HostConfig {
583719 , resources=defaultContainerResources
584720 }
585721
722+-- Default container resource contstraints (None).
586723defaultContainerResources :: ContainerResources
587724defaultContainerResources = ContainerResources {
588725 cpuShares=Nothing
@@ -600,34 +737,80 @@ defaultContainerResources = ContainerResources {
600737 , memory=Nothing
601738 , memoryReservation=Nothing
602739 , memorySwap=Nothing
603− , oomKillDisable=False
740+ , oomKillDisable=Just False
604741 , ulimits=[]
605742 }
606743
607−
744+-- | Default create options when creating a container. You only need to
745+-- specify an image name and the rest is all sensible defaults.
608746defaultCreateOpts :: T.Text -> CreateOpts
609−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+ }
610752
611−-- detachKeys – Override the key sequence for detaching a container.
753+-- | Override the key sequence for detaching a container.
612754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
613755data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
614756
757+-- | Options for starting a container.
615758data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
616759
760+-- | Default options for staring a container.
617761defaultStartOpts :: StartOpts
618762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
619763
620−data DeleteOpts = DeleteOpts {
764+-- | Options for deleting a container.
765+data ContainerDeleteOpts = ContainerDeleteOpts {
621766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
622767 , force :: Bool -- ^ If the container is still running force deletion anyway.
623768 } deriving (Eq, Show)
624769
625−defaultDeleteOpts :: DeleteOpts
626−defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
627−
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+
792+-- | Default options for deleting a container. Most of the time we DON'T
793+-- want to delete the container's volumes or force delete it if it's
794+-- running.
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
804+
805+-- | Timestamp alias.
628806type Timestamp = Integer
807+
808+-- | Used for requesting N number of lines when tailing a containers log
809+-- output.
629810data TailLogOpt = Tail Integer | All deriving (Eq, Show)
630811
812+
813+-- | Log options used when requesting the log output from a container.
631814data LogOpts = LogOpts {
632815 stdout :: Bool
633816 , stderr :: Bool
@@ -636,6 +819,7 @@ data LogOpts = LogOpts {
636819 , tail :: TailLogOpt
637820 } deriving (Eq, Show)
638821
822+-- | Sensible default for log options.
639823defaultLogOpts :: LogOpts
640824defaultLogOpts = LogOpts { stdout = True
641825 , stderr = True
@@ -644,37 +828,87 @@ defaultLogOpts = LogOpts { stdout = True
644828 , tail = All
645829 }
646830
647−data VolumePermission = Rw | Ro deriving (Eq, Show, Generic)
648−
649−-- instance ToJSON VolumePermission where
650−-- toJSON = error "TODO"
651−-- instance FromJSON VolumePermission where
652−-- parseJSON = error "TODO"
653−
654−-- Note: Note really sure what this should be (1.24).
655−-- This is not the same as [Volume] in HostConfig.
656−newtype Volumes = Volumes [Text] -- [Volume]
657− deriving (Eq, Show)
658−
659−instance FromJSON Volumes where
660− parseJSON (JSON.Object o) = return $ Volumes $ HM.keys o
661− parseJSON _ = fail "Volumes is not an object"
662−
663−instance ToJSON Volumes where
664− toJSON (Volumes vs) = toJSON vs
665−
666−data Volume = Volume { hostSrc :: Text
667− , containerDest :: Text
668− , volumePermission :: Maybe VolumePermission
669− } deriving (Eq, Show)
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+
861+-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862+-- | Set permissions on volumes that you mount in the container.
863+data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864+
865+instance ToJSON VolumePermission where
866+ toJSON ReadWrite = "rw"
867+ toJSON ReadOnly = "ro"
868+
869+instance FromJSON VolumePermission where
870+ parseJSON "rw" = return ReadWrite
871+ parseJSON "ro" = return ReadOnly
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
875+
876+-- | Used for marking a directory in the container as "exposed" hence
877+-- taking it outside of the COW filesystem and making it mountable
878+-- in other containers using "VolumesFrom". The volume usually get's
879+-- created somewhere in @/var/lib/docker/volumes@ (depending on the volume
880+-- driver used).
881+-- The CLI example is:
882+--
883+-- @
884+-- docker run --name app -v \/opt\/data -it myapp:latest
885+-- docker run --name app2 --volumes-from app \/bin\/bash -c "ls -l \/opt\/data"
886+-- @
887+newtype Volume = Volume FilePath deriving (Eq, Show)
888+
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
890+ toJSON [] = emptyJsonObject
891+ toJSON (v:vs) = toJsonKey (v:vs) getKey
892+ where getKey (Volume v) = v
893+
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
895+ parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
898+
899+
900+data Bind = Bind { hostSrc :: Text
901+ , containerDest :: Text
902+ , volumePermission :: Maybe VolumePermission
903+ } deriving (Eq, Show)
670904
671−instance FromJSON Volume where
905+instance FromJSON Bind where
672906 parseJSON (JSON.String t) = case T.split (== ':') t of
673− [src, dest] -> return $ Volume src dest Nothing
674− [src, dest, "rw"] -> return $ Volume src dest $ Just Rw
675− [src, dest, "ro"] -> return $ Volume src dest $ Just Ro
676− _ -> fail "Could not parse Volume"
677− parseJSON _ = fail "Volume is not a string"
907+ [src, dest] -> return $ Bind src dest Nothing
908+ [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909+ [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910+ _ -> fail "Could not parse Bind"
911+ parseJSON _ = fail "Bind is not a string"
678912
679913data Device = Device {
680914 pathOnHost :: FilePath
@@ -696,19 +930,19 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
696930
697931instance FromJSON VolumeFrom where
698932 parseJSON (JSON.String t) = case T.split (== ':') t of
699− [vol] -> return $ VolumeFrom vol Nothing
700− [vol, "rw"] -> return $ VolumeFrom vol $ Just Rw
701− [vol, "ro"] -> return $ VolumeFrom vol $ Just Ro
702− _ -> fail "Could not parse VolumeFrom"
933+ [vol] -> return $ VolumeFrom vol Nothing
934+ [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935+ [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936+ _ -> fail "Could not parse VolumeFrom"
703937 parseJSON _ = fail "VolumeFrom is not a string"
704938
705939instance ToJSON VolumeFrom where
706940 toJSON (VolumeFrom n p) = case p of
707− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
708942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
709943
710−instance ToJSON Volume where
711− toJSON (Volume src dest mode) = toJSON $ case mode of
944+instance ToJSON Bind where
945+ toJSON (Bind src dest mode) = toJSON $ case mode of
712946 Nothing -> T.concat[src, ":", dest]
713947 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
714948
@@ -716,63 +950,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
716950
717951instance FromJSON Link where
718952 parseJSON (JSON.String t) = case T.split (== ':') t of
719− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
720954 [f,s] -> return $ Link f $ Just s
721− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
722956 parseJSON _ = fail "Link is not a string"
723957
724958instance ToJSON Link where
725959 toJSON (Link n1 n2) = toJSON $ case n2 of
726960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
727− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
728962
729963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
730964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
731965
732966instance FromJSON LogDriverType where
733967 parseJSON (JSON.String "json-file") = return JsonFile
734− parseJSON (JSON.String "syslog") = return Syslog
735− parseJSON (JSON.String "journald") = return Journald
736− parseJSON (JSON.String "gelf") = return Gelf
737− parseJSON (JSON.String "fluentd") = return Fluentd
738− parseJSON (JSON.String "awslogs") = return AwsLogs
739− parseJSON (JSON.String "splunk") = return Splunk
740− parseJSON (JSON.String "etwlogs") = return Etwlogs
741− parseJSON (JSON.String "none") = return LoggingDisabled
742− 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"
743977
744978instance ToJSON LogDriverType where
745− toJSON JsonFile = JSON.String "json-file"
746− toJSON Syslog = JSON.String "syslog"
747− toJSON Journald = JSON.String "journald"
748− toJSON Gelf = JSON.String "gelf"
749− toJSON Fluentd = JSON.String "fluentd"
750− toJSON AwsLogs = JSON.String "awslogs"
751− toJSON Splunk = JSON.String "splunk"
752− 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"
753987 toJSON LoggingDisabled = JSON.String "none"
754988
755−newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
989+data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
756990
757−instance FromJSON LogDriverOptions where
758− parseJSON (JSON.Object o) = do
759− 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
760996
761− where
762− 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
7631000 acc <- accM
764− return $ M.insert k v acc
765− f _ _ _ = fail "Value of LogDriverOptions is not a string"
766−
767− parseJSON JSON.Null = return $ LogDriverOptions M.empty
768− parseJSON _ = fail "LogDriverOptions is not an object"
1001+ value <- parseJSON v
1002+ return $ (LogDriverOption k value):acc
1003+ parseJSON JSON.Null = return []
1004+ parseJSON _ = fail "Failed to parse LogDriverOptions"
7691005
770−instance ToJSON LogDriverOptions where
771− toJSON (LogDriverOptions mp) = toJSON mp
772−
773−data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1006+data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
7741007
7751008instance ToJSON LogDriverConfig where
1009+ toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
7761010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
7771011
7781012instance FromJSON LogDriverConfig where
@@ -783,19 +1017,41 @@ instance FromJSON LogDriverConfig where
7831017 parseJSON _ = fail "LogDriverConfig is not an object"
7841018
7851019-- TODO: Add container:<name|id> mode
786−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
7871021 deriving (Eq, Show, Ord)
7881022
7891023instance FromJSON NetworkMode where
790− parseJSON (JSON.String "bridge") = return Bridge
791− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
792− parseJSON (JSON.String "none") = return NetworkDisabled
793− 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"
7941029
7951030instance ToJSON NetworkMode where
796− toJSON Bridge = JSON.String "bridge"
797− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
7981033 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]
7991055
8001056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
8011057
@@ -811,7 +1067,7 @@ instance FromJSON PortType where
8111067 parseJSON val = case val of
8121068 "tcp" -> return TCP
8131069 "udp" -> return UDP
814− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
8151071
8161072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
8171073--
@@ -827,15 +1083,7 @@ instance FromJSON PortType where
8271083-- the outside world. We either map a port onto all interfaces (default) or onto a specific
8281084-- interface like `127.0.0.1`.
8291085-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
830−-- instnace will only send the last one.
831−newtype PortBindings = PortBindings [PortBinding]
832− deriving (Eq, Show)
833−
834−
835−instance Monoid PortBindings where
836− mempty = PortBindings []
837− mappend (PortBindings p1) (PortBindings p2) = PortBindings (p1 ++ p2)
838−
1086+-- instance will only send the last one.
8391087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
8401088data PortBinding = PortBinding {
8411089 containerPort :: Port
@@ -846,24 +1094,62 @@ data PortBinding = PortBinding {
8461094portAndType2Text :: Port -> PortType -> Text
8471095portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
8481096
1097+
1098+-- | A helper function to more easily add a bind mount to existing
1099+-- "CreateOpts" records.
1100+addBind :: Bind -> CreateOpts -> CreateOpts
1101+addBind b c = c{hostConfig=hc{binds=obs <> [b]}}
1102+ where hc = hostConfig c
1103+ obs = binds $ hostConfig c
1104+
1105+-- | Helper function for adding a Command to and existing
1106+-- CreateOpts record.
1107+setCmd :: Text -> CreateOpts -> CreateOpts
1108+setCmd ccmd c = c{containerConfig=cc{cmd=[ccmd]}}
1109+ where cc = containerConfig c
1110+
1111+-- | Helper function for adding a "Link" to and existing
1112+-- CreateOpts record.
1113+addLink :: Link -> CreateOpts -> CreateOpts
1114+addLink l c = c{hostConfig=hc{links=ols <> [l]}}
1115+ where hc = hostConfig c
1116+ ols = links $ hostConfig c
1117+
1118+-- | Helper function for adding a "Volume" to and existing
1119+-- CreateOpts record.
1120+addVolume :: Volume -> CreateOpts -> CreateOpts
1121+addVolume v c = c{containerConfig=cc{volumes=oldvs <> [v]}}
1122+ where cc = containerConfig c
1123+ oldvs = volumes cc
1124+
1125+-- | Helper function for adding a "VolumeFrom" to and existing
1126+-- CreateOpts record.
1127+addVolumeFrom :: VolumeFrom -> CreateOpts -> CreateOpts
1128+addVolumeFrom vf c = c{hostConfig=hc{volumesFrom=oldvfs <> [vf]}}
1129+ where hc = hostConfig c
1130+ oldvfs = volumesFrom hc
1131+
8491132-- | A convenience function that adds PortBindings to and exiting
8501133-- "CreateOpts" record. Useful with 'defaultCreateOpts'
8511134-- Example:
8521135--
8531136-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
854−-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
855−addPortBinding :: CreateOpts -> PortBinding -> CreateOpts
856−addPortBinding c pb = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1137+-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
1138+addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
1139+addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
8571140 where hc = hostConfig c
8581141 pbs = portBindings $ hostConfig c
8591142
860−instance ToJSON PortBinding where
861− 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
8621149
863−instance FromJSON PortBindings where
864− parseJSON (JSON.Object o) = do
865− PortBindings <$> HM.foldlWithKey' f (return []) o
8661150
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1152+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
8671153 where
8681154 f accM k v = case T.split (== '/') k of
8691155 [port', portType'] -> do
@@ -872,16 +1158,15 @@ instance FromJSON PortBindings where
8721158 acc <- accM
8731159 hps <- parseJSON v
8741160 return $ (PortBinding port portType hps):acc
875− _ ->
876− fail "Could not parse PortBindings"
1161+ _ -> fail "Could not parse PortBindings"
1162+ parseJSON (JSON.Null) = return []
8771163 parseJSON _ = fail "PortBindings is not an object"
8781164
879−instance ToJSON PortBindings where
880− toJSON (PortBindings []) = JSON.Object HM.empty
881− toJSON (PortBindings (p:ps)) = JSON.Object $ foldl f HM.empty (p:ps)
882− where mKey p = portAndType2Text (containerPort p) (portType p)
883− mVal p = toJSON $ hostPorts p
884− 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
8851170
8861171data HostPort = HostPort {
8871172 hostIp :: Text
@@ -899,24 +1184,6 @@ instance FromJSON HostPort where
8991184 return $ HostPort i p
9001185 parseJSON _ = fail "HostPort is not an object."
9011186
902−-- newtype HostPorts = HostPorts [HostPort]
903−-- deriving (Eq, Show)
904−--
905−-- instance ToJSON HostPorts where
906−-- toJSON (HostPorts hps) = toJSON hps
907−--
908−-- instance FromJSON HostPorts where
909−-- parseJSON (JSON.Object o) = do
910−-- HostPorts <$> HM.foldlWithKey' f (return []) o
911−--
912−-- where
913−-- f accM k v = do
914−-- acc <- accM
915−-- p' <- parseJSON v
916−-- p <- parseIntegerText p'
917−-- return $ (HostPort (NetworkInterface k) p):acc
918−-- parseJSON _ = fail $ "HostPorts is not an object"
919−
9201187-- { "Name": "on-failure" , "MaximumRetryCount": 2}
9211188type RetryCount = Integer
9221189data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
@@ -930,7 +1197,7 @@ instance FromJSON RestartPolicy where
9301197 "on-failure" -> do
9311198 retry <- o .: "MaximumRetryCount"
9321199 return $ RestartOnFailure retry
933− "off" -> return RestartOff
1200+ "no" -> return RestartOff
9341201 _ -> fail "Could not parse RestartPolicy"
9351202 parseJSON _ = fail "RestartPolicy is not an object"
9361203
@@ -938,7 +1205,7 @@ instance ToJSON RestartPolicy where
9381205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
9391206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
9401207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
941− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
9421209
9431210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
9441211
@@ -948,11 +1215,11 @@ newtype UTSMode = UTSMode Text deriving (Eq, Show)
9481215-- TODO: Add UTSMode : UTS namespace to use for the container
9491216-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
9501217data HostConfig = HostConfig
951− { binds :: [Volume]
1218+ { binds :: [Bind]
9521219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
9531220 , logConfig :: LogDriverConfig
9541221 , networkMode :: NetworkMode
955− , portBindings :: PortBindings
1222+ , portBindings :: [PortBinding]
9561223 , restartPolicy :: RestartPolicy
9571224 , volumeDriver :: Maybe Text
9581225 , volumesFrom :: [VolumeFrom]
@@ -1111,6 +1378,22 @@ instance ToJSON DeviceRate where
11111378 , "Rate" .= r
11121379 ]
11131380
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+
11141397data ContainerResources = ContainerResources {
11151398 cpuShares :: Maybe Integer
11161399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1126,12 +1409,12 @@ data ContainerResources = ContainerResources {
11261409 , cpusetMems :: Maybe Text
11271410 , devices :: [Device]
11281411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1129− , kernelMemory :: Maybe Integer
1130− , memory :: Maybe Integer
1131− , memoryReservation :: Maybe Integer
1132− , memorySwap :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1413+ , memory :: Maybe MemoryConstraint
1414+ , memoryReservation :: Maybe MemoryConstraint
1415+ , memorySwap :: Maybe MemoryConstraint
11331416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1134− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
11351418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
11361419 , ulimits :: [Ulimit]
11371420 -- TODO: Missing from 1.24
@@ -1169,41 +1452,59 @@ instance FromJSON EnvVar where
11691452 parseJSON _ = fail "EnvVar is not a string"
11701453
11711454instance ToJSON EnvVar where
1172− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
11731456
1174−-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1457+-- | ExposedPort represents a port (and it's type)
11751458-- that a container should expose to other containers or the host system.
1176−-- `NOTE`: This does not automatically expose the ports onto the host
1177−-- 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
11781461-- the PublishAllPorts flag. It is also useful for
11791462-- the daemon to know which Environment variables to
11801463-- inject into a container linking to our container.
11811464-- Example linking a Postgres container named db would inject the following
11821465-- environment variables automatically if we set the corresponding
1183−-- ExposedPorts:
1466+--
1467+-- ExposedPort:
1468+--
1469+-- @
11841470-- DB_PORT_5432_TCP_PORT="5432"
11851471-- DB_PORT_5432_TCP_PROTO="tcp"
11861472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1187−newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1188−-- JP: Should this be ExposedPorts [(Port, PortType)]?
1189−
1190−instance FromJSON ExposedPorts where
1191− parseJSON (JSON.Object o) = do
1192− ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
1473+-- @
1474+data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
11931475
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
11941478 where
11951479 f accM k _ = case T.split (== '/') k of
11961480 [port', portType'] -> do
11971481 port <- parseIntegerText port'
11981482 portType <- parseJSON $ JSON.String portType'
11991483 acc <- accM
1200− return $ M.insert port portType acc
1201− _ ->
1202− fail "Could not parse ExposedPorts"
1203− 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 "/"
12041494
1205−instance ToJSON ExposedPorts where
1206− toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
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"
12071508
12081509
12091510data ContainerConfig = ContainerConfig {
@@ -1213,7 +1514,7 @@ data ContainerConfig = ContainerConfig {
12131514 , attachStdin :: Bool
12141515 , attachStdout :: Bool
12151516 , attachStderr :: Bool
1216− , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
1517+ , exposedPorts :: [ExposedPort]
12171518 -- , publishService :: Text -- Don't see this in 1.24
12181519 , tty :: Bool
12191520 , openStdin :: Bool
@@ -1222,27 +1523,70 @@ data ContainerConfig = ContainerConfig {
12221523 , cmd :: [Text]
12231524 -- , argsEscaped :: Bool -- Don't see this in 1.24
12241525 , image :: Text
1225− , volumes :: Maybe Volumes
1526+ , volumes :: [Volume]
12261527 , workingDir :: Maybe FilePath
1227− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
12281529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
12291530 , macAddress :: Maybe Text
12301531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1231− , labels :: Maybe Labels
1532+ , labels :: [Label]
12321533 , stopSignal :: Signal
12331534 } deriving (Eq, Show, Generic)
12341535
1536+
12351537instance ToJSON ContainerConfig where
12361538 toJSON = genericToJSON defaultOptions {
12371539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
12381540
12391541instance FromJSON ContainerConfig where
1240− parseJSON = genericParseJSON defaultOptions {
1241− 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."
12421566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
12431570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
12441572parseIntegerText t = case readMaybe $ T.unpack t of
12451573 Nothing ->
12461574 fail "Could not parse Integer"
12471575 Just i ->
12481576 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