@@ -11,11 +11,7 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14− , NetworkID
15− , fromNetworkID
16− , toNetworkID
1714 , Timeout(..)
18− , StatusCode(..)
1915 , Signal(..)
2016 , ContainerDetails(..)
2117 , DockerClientOpts(..)
@@ -26,48 +22,41 @@ module Docker.Client.Types (
2622 , ContainerPortInfo(..)
2723 , Container(..)
2824 , ContainerState(..)
29− , State(..)
25+ , Status(..)
3026 , Digest
31− , Label(..)
27+ , Labels(..)
3228 , Tag
3329 , Image(..)
34− , Entrypoint(..)
3530 , dropImagePrefix
3631 , CreateOpts(..)
37− , BuildOpts(..)
38− , defaultBuildOpts
3932 , defaultCreateOpts
4033 , DetachKeys(..)
4134 , StartOpts(..)
4235 , defaultStartOpts
43− , ContainerDeleteOpts(..)
44− , defaultContainerDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
36+ , DeleteOpts(..)
37+ , defaultDeleteOpts
4738 , Timestamp
4839 , TailLogOpt(..)
4940 , LogOpts(..)
5041 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
5342 , VolumePermission(..)
54− , Bind(..)
5543 , Volume(..)
5644 , Device(..)
5745 , ContainerName
5846 , VolumeFrom(..)
5947 , Link(..)
6048 , LogDriverType(..)
61− , LogDriverOption(..)
49+ , LogDriverOptions(..)
6250 , LogDriverConfig(..)
6351 , NetworkMode(..)
6452 , PortType(..)
6553-- , NetworkInterface(..)
66− , Network(..)
54+ , Networks(..)
6755 , NetworkSettings(..)
6856 , NetworkOptions(..)
6957 , Mount(..)
7058 , PortBinding(..)
59+ , PortBindings(..)
7160 , HostPort(..)
7261 , RetryCount
7362 , RestartPolicy(..)
@@ -75,8 +64,6 @@ module Docker.Client.Types (
7564 , UTSMode(..)
7665 , HostConfig(..)
7766 , defaultHostConfig
78− , NetworkingConfig(..)
79− , EndpointConfig(..)
8067 , Ulimit(..)
8168 , ContainerResources(..)
8269 , defaultContainerResources
@@ -86,18 +73,10 @@ module Docker.Client.Types (
8673 , EnvVar(..)
8774 , ContainerConfig(..)
8875 , defaultContainerConfig
89− , ExposedPort(..)
76+ , ExposedPorts(..)
9077 , DeviceWeight(..)
9178 , DeviceRate(..)
9279 , addPortBinding
93− , addExposedPort
94− , addBind
95− , setCmd
96− , addLink
97− , addVolume
98− , addVolumeFrom
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
10180 ) where
10281
10382import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,57 +86,40 @@ import qualified Data.Aeson as JSON
10786import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
10887import Data.Char (isAlphaNum, toUpper)
10988import qualified Data.HashMap.Strict as HM
89+import qualified Data.Map as M
11090import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
11291import Data.Text (Text)
11392import qualified Data.Text as T
11493import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
11694import GHC.Generics (Generic)
11795import Prelude hiding (all, tail)
11896import Text.Read (readMaybe)
11997
120−-- | List of Docker Engine API endpoints
12198data Endpoint =
12299 VersionEndpoint
123100 | ListContainersEndpoint ListOpts
124101 | ListImagesEndpoint ListOpts
125− | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
102+ | CreateContainerEndpoint CreateOpts
126103 | StartContainerEndpoint StartOpts ContainerID
127104 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129105 | KillContainerEndpoint Signal ContainerID
130106 | RestartContainerEndpoint Timeout ContainerID
131107 | PauseContainerEndpoint ContainerID
132108 | UnpauseContainerEndpoint ContainerID
133109 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134110 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
111+ | DeleteContainerEndpoint DeleteOpts ContainerID
136112 | 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
142113 deriving (Eq, Show)
143114
144−-- | We should newtype this
145115type URL = Text
146−
147−-- | We should newtype this
148116type ApiVersion = Text
149−
150−
151−-- | ID of a contianer
152117newtype ContainerID = ContainerID Text
153118 deriving (Eq, Show)
154119
155−-- | Used for extracting the id of the container from the newtype
156120fromContainerID :: ContainerID -> Text
157121fromContainerID (ContainerID t) = t
158122
159−-- | Used for parsing a Text value into a ContainerID. We apply some basic
160−-- validation here.
161123toContainerID :: Text -> Maybe ContainerID
162124toContainerID t =
163125 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -165,16 +127,12 @@ toContainerID t =
165127 else
166128 Nothing
167129
168−-- ID of an image.
169130newtype ImageID = ImageID Text
170131 deriving (Eq, Show)
171132
172−-- | Used for extracting the id of the image from the newtype.
173133fromImageID :: ImageID -> Text
174134fromImageID (ImageID t) = t
175135
176−-- | Helper function used for parsing a Text value into an ImageID. For now
177−-- just basic validation is used.
178136toImageID :: Text -> Maybe ImageID
179137toImageID t =
180138 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -182,26 +140,9 @@ toImageID t =
182140 else
183141 Nothing
184142
185−-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186143data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
187144
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−
202145-- 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.
205146data Signal = SIGHUP
206147 | SIGINT
207148 | SIGQUIT
@@ -213,16 +154,16 @@ data Signal = SIGHUP
213154
214155instance FromJSON Signal where
215156 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
157+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
158+ parseJSON (JSON.String "SIGINT") = return SIGINT
218159 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219160 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220161 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
162+ parseJSON _ = fail "Unknown Signal"
222163
223164instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
165+ toJSON SIGHUP = "SIGHUP"
166+ toJSON SIGINT = "SIGINT"
226167 toJSON SIGQUIT = "SIGQUIT"
227168 toJSON SIGSTOP = "SIGSTOP"
228169 toJSON SIGTERM = "SIGTERM"
@@ -250,19 +191,17 @@ data ContainerDetails = ContainerDetails {
250191 , processLabel :: Text
251192 , resolveConfPath :: FilePath
252193 , restartCount :: Int
253− , containerDetailsState :: ContainerState
194+ , state :: ContainerState
254195 , mounts :: [Mount]
255196 }
256197 deriving (Eq, Show, Generic)
257198
258−-- | Data type used for parsing the mount information from a container
259−-- list.
260199data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
200+ mountName :: Text
262201 , mountSource :: FilePath
263202 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
203+ , mountDriver :: Text
204+ , mountMode :: Text -- Note: Improve this?
266205 , mountRW :: Bool
267206 , mountPropogation :: Text
268207 }
@@ -270,18 +209,16 @@ data Mount = Mount {
270209
271210instance FromJSON Mount where
272211 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
212+ name <- o .: "Name"
274213 src <- o .: "Source"
275214 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
215+ driver <- o .: "Driver"
216+ mode <- o .: "Mode"
278217 rw <- o .: "RW"
279218 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
219+ return $ Mount name src dest driver mode rw prop
281220 parseJSON _ = fail "Mount is not an object"
282221
283−-- | Data type used for parsing the container state from a list of
284−-- containers.
285222data ContainerState = ContainerState {
286223 containerError :: Text
287224 , exitCode :: Int
@@ -293,7 +230,7 @@ data ContainerState = ContainerState {
293230 , restarting :: Bool
294231 , running :: Bool
295232 , startedAt :: UTCTime
296− , state :: State
233+ , status :: Status
297234 }
298235 deriving (Eq, Show, Generic)
299236
@@ -313,30 +250,23 @@ instance FromJSON ContainerState where
313250 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
314251 parseJSON _ = fail "ContainerState is not an object"
315252
316−
317−-- | Client options used to configure the remote engine we're talking to
318253data DockerClientOpts = DockerClientOpts {
319254 apiVer :: ApiVersion
320255 , baseUrl :: URL
321256 }
322257 deriving (Eq, Show)
323258
324−-- | Default "DockerClientOpts" used for talking to the docker engine.
325259defaultClientOpts :: DockerClientOpts
326260defaultClientOpts = DockerClientOpts {
327261 apiVer = "v1.24"
328262 , baseUrl = "http://127.0.0.1:2375"
329263 }
330264
331−-- | List options used for filtering the list of container or images.
332265data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
333266
334−-- | Default "ListOpts". Doesn't list stopped containers.
335267defaultListOpts :: ListOpts
336268defaultListOpts = ListOpts { all=False }
337269
338−-- | Data type used for represneting the version of the docker engine
339−-- remote API.
340270data DockerVersion = DockerVersion {
341271 version :: Text
342272 , apiVersion :: ApiVersion
@@ -406,8 +336,6 @@ instance FromJSON ImageID where
406336 return iid
407337 parseJSON _ = fail "ImageID is not an object."
408338
409−-- | Data type used for representing the information of various ports that
410−-- a contianer may expose.
411339data ContainerPortInfo = ContainerPortInfo {
412340 ipAddressInfo :: Maybe Text
413341 , privatePortInfo :: Port
@@ -424,8 +352,6 @@ instance FromJSON ContainerPortInfo where
424352 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
425353
426354-- For inspecting container details.
427−-- | Data type used for parsing the network information of each container
428−-- when listing them.
429355data NetworkOptions = NetworkOptions {
430356-- ipamConfig :: Maybe Text -- Don't see in 1.24
431357-- , links :: Maybe Text -- Don't see in 1.24
@@ -455,28 +381,29 @@ instance FromJSON NetworkOptions where
455381 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
456382 parseJSON _ = fail "NetworkOptions is not an object"
457383
458−-- TODO: Not sure what this is used for anymore.
459−data Network = Network NetworkMode NetworkOptions
384+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
460385 deriving (Eq, Show)
461386
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
387+instance FromJSON Networks where
388+ parseJSON (JSON.Object o) = do
389+ Networks <$> HM.foldlWithKey' f (return M.empty) o
390+
464391 where
465392 f accM k' v' = do
466393 acc <- accM
467394 k <- parseJSON $ JSON.String k'
468395 v <- parseJSON v'
469− return $ (Network k v):acc
396+ return $ M.insert k v acc
397+
470398 parseJSON _ = fail "Networks is not an object"
471399
472−-- | Data type reprsenting the various network settings a container can have.
473400data NetworkSettings = NetworkSettings {
474401 networkSettingsBridge :: Text
475402 , networkSettingsSandboxId :: Text
476403 , networkSettingsHairpinMode :: Bool
477404 , networkSettingsLinkLocalIPv6Address :: Text
478405 , networkSettingsLinkLocalIPv6PrefixLen :: Int
479− , networkSettingsPorts :: [PortBinding]
406+ , networkSettingsPorts :: PortBindings
480407 , networkSettingsSandboxKey :: Text
481408 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482409 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -488,7 +415,7 @@ data NetworkSettings = NetworkSettings {
488415 , networkSettingsIpPrefixLen :: Int
489416 , networkSettingsIpv6Gateway :: Text
490417 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
418+ , networkSettingsNetworks :: Networks
492419 }
493420 deriving (Eq, Show)
494421
@@ -515,7 +442,6 @@ instance FromJSON NetworkSettings where
515442 return $ NetworkSettings bridge sandbox hairpin localIP6 localIP6Len ports sandboxKey secondaryIP secondayIP6 endpointID gateway globalIP6 globalIP6Len ip ipLen ip6Gateway mac networks
516443 parseJSON _ = fail "NetworkSettings is not an object."
517444
518−-- | Data type used for parsing a list of containers.
519445data Container = Container
520446 { containerId :: ContainerID
521447 , containerNames :: [Text]
@@ -523,23 +449,21 @@ data Container = Container
523449 , containerImageId :: ImageID
524450 , containerCommand :: Text
525451 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
452+ , containerStatus :: Status
528453 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
530− , containerNetworks :: [Network]
454+ , containerLabels :: Labels
455+ , containerNetworks :: Networks
531456 , containerMounts :: [Mount]
532457 } deriving (Show, Eq)
533458
534459instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
460+ parseJSON (JSON.Object v) =
461+ Container <$> (v .: "Id")
537462 <*> (v .: "Names")
538463 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
464+ <*> (v .: "ImageID")
465+ <*> (v .: "Command")
541466 <*> (v .: "Created")
542− <*> (v .: "State")
543467 <*> (v .: "Status")
544468 <*> (v .: "Ports")
545469 <*> (v .: "Labels")
@@ -549,124 +473,65 @@ instance FromJSON Container where
549473 parseNetworks (JSON.Object v) =
550474 (v .: "Networks") >>= parseJSON
551475 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
476+
552477 parseJSON _ = fail "Container: Not a JSON object."
553478
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
479+data Status = Created | Restarting | Running | Paused | Exited | Dead
556480 deriving (Eq, Show, Generic)
557481
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.
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.
561485 parseJSON (JSON.String "restarting") = return Restarting
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
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"
566490
567−-- | Alias for representing a RepoDigest. We could newtype this and add
568−-- some validation.
569491type Digest = Text
570492
571−-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
493+newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
573494
495+instance FromJSON Labels where
496+ parseJSON val = Labels <$> parseJSON val
574497
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
498+instance ToJSON Labels where
499+ toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
582500
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.
593501type Tag = Text
594502
595−-- | Data type used for parsing information from a list of images.
596503data Image = DockerImage {
597504 imageId :: ImageID
598505 , imageCreated :: Integer
599506 , imageParentId :: Maybe ImageID
600507 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
508+ , imageRepoDigests :: Maybe [Digest]
602509 , imageSize :: Integer
603510 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
511+ , imageLabels :: Maybe Labels
605512 } deriving (Show, Eq, Generic)
606513
607−-- | Helper function used for dropping the "image" prefix when serializing
608−-- the Image data type to and from json.
609514dropImagePrefix :: [a] -> [a]
610515dropImagePrefix = drop 5
611516
612−
613517instance 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.
518+ parseJSON = genericParseJSON defaultOptions {
519+ fieldLabelModifier = dropImagePrefix}
520+
651521data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
522+ containerConfig :: ContainerConfig
523+ , hostConfig :: HostConfig
655524 } deriving (Eq, Show)
656525
657526instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
527+ toJSON (CreateOpts cc hc) = do
659528 let ccJSON = toJSON cc
660529 let hcJSON = toJSON hc
661530 case ccJSON of
662531 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665− JSON.Object o2
532+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666533 _ -> error "ContainerConfig is not an object." -- This should never happen.
667534
668−-- | Container configuration used for creating a container with sensible
669−-- defaults.
670535defaultContainerConfig :: Text -> ContainerConfig
671536defaultContainerConfig imageName = ContainerConfig {
672537 hostname=Nothing
@@ -676,29 +541,28 @@ defaultContainerConfig imageName = ContainerConfig {
676541 , attachStdout=False
677542 , image=imageName
678543 , attachStderr=False
679− , exposedPorts=[]
544+ , exposedPorts=Nothing -- ExposedPorts M.empty
680545 , tty=False
681546 , openStdin=False
682547 , stdinOnce=False
683548 , env=[]
684549 , cmd=[]
685− , volumes=[]
550+ , volumes=Nothing
686551 , workingDir=Nothing
687− , entrypoint=Entrypoint []
552+ , entrypoint=Nothing
688553 , networkDisabled=Nothing
689554 , macAddress=Nothing
690− , labels=[]
555+ , labels=Nothing
691556 , stopSignal=SIGTERM
692557 }
693558
694−-- | Default host confiratuon used for creating a container.
695559defaultHostConfig :: HostConfig
696560defaultHostConfig = HostConfig {
697561 binds=[]
698562 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
701− , portBindings=[]
563+ , logConfig=LogDriverConfig JsonFile Nothing
564+ , networkMode=Bridge
565+ , portBindings=PortBindings []
702566 , restartPolicy=RestartOff
703567 , volumeDriver=Nothing
704568 , volumesFrom=[]
@@ -719,7 +583,6 @@ defaultHostConfig = HostConfig {
719583 , resources=defaultContainerResources
720584 }
721585
722−-- Default container resource contstraints (None).
723586defaultContainerResources :: ContainerResources
724587defaultContainerResources = ContainerResources {
725588 cpuShares=Nothing
@@ -737,80 +600,34 @@ defaultContainerResources = ContainerResources {
737600 , memory=Nothing
738601 , memoryReservation=Nothing
739602 , memorySwap=Nothing
740− , oomKillDisable=Just False
603+ , oomKillDisable=False
741604 , ulimits=[]
742605 }
743606
744−-- | Default create options when creating a container. You only need to
745−-- specify an image name and the rest is all sensible defaults.
607+
746608defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
609+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752610
753−-- | Override the key sequence for detaching a container.
611+-- detachKeys – Override the key sequence for detaching a container.
754612-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
755613data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
756614
757−-- | Options for starting a container.
758615data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
759616
760−-- | Default options for staring a container.
761617defaultStartOpts :: StartOpts
762618defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763619
764−-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
620+data DeleteOpts = DeleteOpts {
766621 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767622 , force :: Bool -- ^ If the container is still running force deletion anyway.
768623 } deriving (Eq, Show)
769624
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.
806−type Timestamp = Integer
625+defaultDeleteOpts :: DeleteOpts
626+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
807627
808−-- | Used for requesting N number of lines when tailing a containers log
809−-- output.
628+type Timestamp = Integer
810629data TailLogOpt = Tail Integer | All deriving (Eq, Show)
811630
812−
813−-- | Log options used when requesting the log output from a container.
814631data LogOpts = LogOpts {
815632 stdout :: Bool
816633 , stderr :: Bool
@@ -819,7 +636,6 @@ data LogOpts = LogOpts {
819636 , tail :: TailLogOpt
820637 } deriving (Eq, Show)
821638
822−-- | Sensible default for log options.
823639defaultLogOpts :: LogOpts
824640defaultLogOpts = LogOpts { stdout = True
825641 , stderr = True
@@ -828,87 +644,37 @@ defaultLogOpts = LogOpts { stdout = True
828644 , tail = All
829645 }
830646
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)
647+data VolumePermission = Rw | Ro deriving (Eq, Show, Generic)
904648
905−instance FromJSON Bind where
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)
670+
671+instance FromJSON Volume where
906672 parseJSON (JSON.String t) = case T.split (== ':') t of
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"
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"
912678
913679data Device = Device {
914680 pathOnHost :: FilePath
@@ -930,19 +696,19 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930696
931697instance FromJSON VolumeFrom where
932698 parseJSON (JSON.String t) = case T.split (== ':') t of
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"
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"
937703 parseJSON _ = fail "VolumeFrom is not a string"
938704
939705instance ToJSON VolumeFrom where
940706 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
707+ Nothing -> toJSON $ n <> ":" <> "rw"
942708 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943709
944−instance ToJSON Bind where
945− toJSON (Bind src dest mode) = toJSON $ case mode of
710+instance ToJSON Volume where
711+ toJSON (Volume src dest mode) = toJSON $ case mode of
946712 Nothing -> T.concat[src, ":", dest]
947713 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
948714
@@ -950,63 +716,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950716
951717instance FromJSON Link where
952718 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
719+ [f] -> return $ Link f Nothing
954720 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
721+ _ -> fail "Could not parse Link"
956722 parseJSON _ = fail "Link is not a string"
957723
958724instance ToJSON Link where
959725 toJSON (Link n1 n2) = toJSON $ case n2 of
960726 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
727+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962728
963729-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964730data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965731
966732instance FromJSON LogDriverType where
967733 parseJSON (JSON.String "json-file") = return JsonFile
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"
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"
977743
978744instance ToJSON LogDriverType where
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"
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"
987753 toJSON LoggingDisabled = JSON.String "none"
988754
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
755+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
990756
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
757+instance FromJSON LogDriverOptions where
758+ parseJSON (JSON.Object o) = do
759+ LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
996760
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
761+ where
762+ f accM k (JSON.String v) = do
1000763 acc <- accM
1001− value <- parseJSON v
1002− return $ (LogDriverOption k value):acc
1003− parseJSON JSON.Null = return []
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
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"
1005769
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
770+instance ToJSON LogDriverOptions where
771+ toJSON (LogDriverOptions mp) = toJSON mp
772+
773+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1007774
1008775instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010776 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1011777
1012778instance FromJSON LogDriverConfig where
@@ -1017,41 +783,19 @@ instance FromJSON LogDriverConfig where
1017783 parseJSON _ = fail "LogDriverConfig is not an object"
1018784
1019785-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
786+data NetworkMode = Bridge | Host | NetworkDisabled
1021787 deriving (Eq, Show, Ord)
1022788
1023789instance FromJSON NetworkMode where
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"
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"
1029794
1030795instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
796+ toJSON Bridge = JSON.String "bridge"
797+ toJSON Host = JSON.String "host"
1033798 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]
1055799
1056800data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057801
@@ -1067,7 +811,7 @@ instance FromJSON PortType where
1067811 parseJSON val = case val of
1068812 "tcp" -> return TCP
1069813 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
814+ _ -> fail "PortType: Invalid port type."
1071815
1072816-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073817--
@@ -1083,7 +827,15 @@ instance FromJSON PortType where
1083827-- the outside world. We either map a port onto all interfaces (default) or onto a specific
1084828-- interface like `127.0.0.1`.
1085829-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
1086−-- instance will only send the last one.
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+
1087839-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1088840data PortBinding = PortBinding {
1089841 containerPort :: Port
@@ -1094,62 +846,24 @@ data PortBinding = PortBinding {
1094846portAndType2Text :: Port -> PortType -> Text
1095847portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
1096848
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−
1132849-- | A convenience function that adds PortBindings to and exiting
1133850-- "CreateOpts" record. Useful with 'defaultCreateOpts'
1134851-- Example:
1135852--
1136853-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
1137−-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
1138−addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
1139−addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
854+-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
855+addPortBinding :: CreateOpts -> PortBinding -> CreateOpts
856+addPortBinding c pb = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1140857 where hc = hostConfig c
1141858 pbs = portBindings $ hostConfig c
1142859
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
860+instance ToJSON PortBinding where
861+ toJSON (PortBinding {..}) = object [portAndType2Text containerPort portType .= hostPorts]
1149862
863+instance FromJSON PortBindings where
864+ parseJSON (JSON.Object o) = do
865+ PortBindings <$> HM.foldlWithKey' f (return []) o
1150866
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1152− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1153867 where
1154868 f accM k v = case T.split (== '/') k of
1155869 [port', portType'] -> do
@@ -1158,15 +872,16 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158872 acc <- accM
1159873 hps <- parseJSON v
1160874 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
875+ _ ->
876+ fail "Could not parse PortBindings"
1163877 parseJSON _ = fail "PortBindings is not an object"
1164878
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
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
1170885
1171886data HostPort = HostPort {
1172887 hostIp :: Text
@@ -1184,6 +899,24 @@ instance FromJSON HostPort where
1184899 return $ HostPort i p
1185900 parseJSON _ = fail "HostPort is not an object."
1186901
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+
1187920-- { "Name": "on-failure" , "MaximumRetryCount": 2}
1188921type RetryCount = Integer
1189922data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
@@ -1197,7 +930,7 @@ instance FromJSON RestartPolicy where
1197930 "on-failure" -> do
1198931 retry <- o .: "MaximumRetryCount"
1199932 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
933+ "off" -> return RestartOff
1201934 _ -> fail "Could not parse RestartPolicy"
1202935 parseJSON _ = fail "RestartPolicy is not an object"
1203936
@@ -1205,7 +938,7 @@ instance ToJSON RestartPolicy where
1205938 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206939 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207940 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
941+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1209942
1210943data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1211944
@@ -1215,11 +948,11 @@ newtype UTSMode = UTSMode Text deriving (Eq, Show)
1215948-- TODO: Add UTSMode : UTS namespace to use for the container
1216949-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
1217950data HostConfig = HostConfig
1218− { binds :: [Bind]
951+ { binds :: [Volume]
1219952 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1220953 , logConfig :: LogDriverConfig
1221954 , networkMode :: NetworkMode
1222− , portBindings :: [PortBinding]
955+ , portBindings :: PortBindings
1223956 , restartPolicy :: RestartPolicy
1224957 , volumeDriver :: Maybe Text
1225958 , volumesFrom :: [VolumeFrom]
@@ -1378,22 +1111,6 @@ instance ToJSON DeviceRate where
13781111 , "Rate" .= r
13791112 ]
13801113
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−
13971114data ContainerResources = ContainerResources {
13981115 cpuShares :: Maybe Integer
13991116 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1126,12 @@ data ContainerResources = ContainerResources {
14091126 , cpusetMems :: Maybe Text
14101127 , devices :: [Device]
14111128 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1413− , memory :: Maybe MemoryConstraint
1414− , memoryReservation :: Maybe MemoryConstraint
1415− , memorySwap :: Maybe MemoryConstraint
1129+ , kernelMemory :: Maybe Integer
1130+ , memory :: Maybe Integer
1131+ , memoryReservation :: Maybe Integer
1132+ , memorySwap :: Maybe Integer
14161133 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1134+ , oomKillDisable :: Bool
14181135 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191136 , ulimits :: [Ulimit]
14201137 -- TODO: Missing from 1.24
@@ -1452,59 +1169,41 @@ instance FromJSON EnvVar where
14521169 parseJSON _ = fail "EnvVar is not a string"
14531170
14541171instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1172+ toJSON (EnvVar n v) = object [n .= v]
14561173
1457−-- | ExposedPort represents a port (and it's type)
1174+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
14581175-- that a container should expose to other containers or the host system.
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
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
14611178-- the PublishAllPorts flag. It is also useful for
14621179-- the daemon to know which Environment variables to
14631180-- inject into a container linking to our container.
14641181-- Example linking a Postgres container named db would inject the following
14651182-- environment variables automatically if we set the corresponding
1466−--
1467−-- ExposedPort:
1468−--
1469−-- @
1183+-- ExposedPorts:
14701184-- DB_PORT_5432_TCP_PORT="5432"
14711185-- DB_PORT_5432_TCP_PROTO="tcp"
14721186-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1473−-- @
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
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
14751193
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
14781194 where
14791195 f accM k _ = case T.split (== '/') k of
14801196 [port', portType'] -> do
14811197 port <- parseIntegerText port'
14821198 portType <- parseJSON $ JSON.String portType'
14831199 acc <- accM
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 "/"
1200+ return $ M.insert port portType acc
1201+ _ ->
1202+ fail "Could not parse ExposedPorts"
1203+ parseJSON _ = fail "ExposedPorts is not an object."
14941204
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"
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)]
15081207
15091208
15101209data ContainerConfig = ContainerConfig {
@@ -1514,7 +1213,7 @@ data ContainerConfig = ContainerConfig {
15141213 , attachStdin :: Bool
15151214 , attachStdout :: Bool
15161215 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1216+ , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
15181217 -- , publishService :: Text -- Don't see this in 1.24
15191218 , tty :: Bool
15201219 , openStdin :: Bool
@@ -1523,70 +1222,27 @@ data ContainerConfig = ContainerConfig {
15231222 , cmd :: [Text]
15241223 -- , argsEscaped :: Bool -- Don't see this in 1.24
15251224 , image :: Text
1526− , volumes :: [Volume]
1225+ , volumes :: Maybe Volumes
15271226 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1227+ , entrypoint :: Maybe Text -- Can be null?
15291228 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301229 , macAddress :: Maybe Text
15311230 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1231+ , labels :: Maybe Labels
15331232 , stopSignal :: Signal
15341233 } deriving (Eq, Show, Generic)
15351234
1536−
15371235instance ToJSON ContainerConfig where
15381236 toJSON = genericToJSON defaultOptions {
15391237 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
15401238
15411239instance FromJSON ContainerConfig where
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."
1240+ parseJSON = genericParseJSON defaultOptions {
1241+ fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
15661242
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701243parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721244parseIntegerText t = case readMaybe $ T.unpack t of
15731245 Nothing ->
15741246 fail "Could not parse Integer"
15751247 Just i ->
15761248 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