@@ -11,11 +11,7 @@ module Docker.Client.Types (
12 , fromImageID
12 , fromImageID
13 , toImageID
13 , toImageID
17 , Timeout(..)
14 , Timeout(..)
19 , Signal(..)
15 , Signal(..)
20 , ContainerDetails(..)
16 , ContainerDetails(..)
21 , DockerClientOpts(..)
17 , DockerClientOpts(..)
@@ -26,48 +22,41 @@ module Docker.Client.Types (
26 , ContainerPortInfo(..)
22 , ContainerPortInfo(..)
27 , Container(..)
23 , Container(..)
28 , ContainerState(..)
24 , ContainerState(..)
29− , State(..)
25+ , Status(..)
31− , Label(..)
27+ , Labels(..)
33 , Image(..)
29 , Image(..)
35 , dropImagePrefix
30 , dropImagePrefix
36 , CreateOpts(..)
31 , CreateOpts(..)
39 , defaultCreateOpts
32 , defaultCreateOpts
40 , DetachKeys(..)
33 , DetachKeys(..)
41 , StartOpts(..)
34 , StartOpts(..)
42 , defaultStartOpts
35 , defaultStartOpts
43− , ContainerDeleteOpts(..)
36+ , DeleteOpts(..)
44− , defaultContainerDeleteOpts
37+ , defaultDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
47 , Timestamp
38 , Timestamp
48 , TailLogOpt(..)
39 , TailLogOpt(..)
49 , LogOpts(..)
40 , LogOpts(..)
50 , defaultLogOpts
41 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
53 , VolumePermission(..)
42 , VolumePermission(..)
55 , Volume(..)
43 , Volume(..)
56 , Device(..)
44 , Device(..)
57 , ContainerName
45 , ContainerName
58 , VolumeFrom(..)
46 , VolumeFrom(..)
59 , Link(..)
47 , Link(..)
60 , LogDriverType(..)
48 , LogDriverType(..)
61− , LogDriverOption(..)
49+ , LogDriverOptions(..)
62 , LogDriverConfig(..)
50 , LogDriverConfig(..)
63 , NetworkMode(..)
51 , NetworkMode(..)
64 , PortType(..)
52 , PortType(..)
65-- , NetworkInterface(..)
53-- , NetworkInterface(..)
66− , Network(..)
54+ , Networks(..)
67 , NetworkSettings(..)
55 , NetworkSettings(..)
68 , NetworkOptions(..)
56 , NetworkOptions(..)
69 , Mount(..)
57 , Mount(..)
70 , PortBinding(..)
58 , PortBinding(..)
71 , HostPort(..)
60 , HostPort(..)
72 , RetryCount
61 , RetryCount
73 , RestartPolicy(..)
62 , RestartPolicy(..)
@@ -75,8 +64,6 @@ module Docker.Client.Types (
75 , UTSMode(..)
64 , UTSMode(..)
76 , HostConfig(..)
65 , HostConfig(..)
77 , defaultHostConfig
66 , defaultHostConfig
78− , NetworkingConfig(..)
80 , Ulimit(..)
67 , Ulimit(..)
81 , ContainerResources(..)
68 , ContainerResources(..)
82 , defaultContainerResources
69 , defaultContainerResources
@@ -86,18 +73,9 @@ module Docker.Client.Types (
86 , EnvVar(..)
73 , EnvVar(..)
87 , ContainerConfig(..)
74 , ContainerConfig(..)
88 , defaultContainerConfig
75 , defaultContainerConfig
89− , ExposedPort(..)
76+ , ExposedPorts(..)
90 , DeviceWeight(..)
77 , DeviceWeight(..)
91 , DeviceRate(..)
78 , DeviceRate(..)
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
81import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,57 +85,40 @@ import qualified Data.Aeson as JSON
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
85import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
108import Data.Char (isAlphaNum, toUpper)
86import Data.Char (isAlphaNum, toUpper)
109import qualified Data.HashMap.Strict as HM
87import qualified Data.HashMap.Strict as HM
88+import qualified Data.Map as M
110import Data.Monoid ((<>))
89import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
112import Data.Text (Text)
90import Data.Text (Text)
113import qualified Data.Text as T
91import qualified Data.Text as T
114import Data.Time.Clock (UTCTime)
92import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116import GHC.Generics (Generic)
93import GHC.Generics (Generic)
117import Prelude hiding (all, tail)
94import Prelude hiding (all, tail)
118import Text.Read (readMaybe)
95import Text.Read (readMaybe)
120−-- | List of Docker Engine API endpoints
121data Endpoint =
97data Endpoint =
122 VersionEndpoint
98 VersionEndpoint
123 | ListContainersEndpoint ListOpts
99 | ListContainersEndpoint ListOpts
124 | ListImagesEndpoint ListOpts
100 | ListImagesEndpoint ListOpts
125− | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
101+ | CreateContainerEndpoint CreateOpts
126 | StartContainerEndpoint StartOpts ContainerID
102 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
103 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
104 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
105 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
106 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
107 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
108 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
109 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
110+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
111 | 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
142 deriving (Eq, Show)
112 deriving (Eq, Show)
144−-- | We should newtype this
145type URL = Text
114type URL = Text
147−-- | We should newtype this
148type ApiVersion = Text
115type ApiVersion = Text
151−-- | ID of a contianer
152newtype ContainerID = ContainerID Text
116newtype ContainerID = ContainerID Text
153 deriving (Eq, Show)
117 deriving (Eq, Show)
155−-- | Used for extracting the id of the container from the newtype
156fromContainerID :: ContainerID -> Text
119fromContainerID :: ContainerID -> Text
157fromContainerID (ContainerID t) = t
120fromContainerID (ContainerID t) = t
159−-- | Used for parsing a Text value into a ContainerID. We apply some basic
161toContainerID :: Text -> Maybe ContainerID
122toContainerID :: Text -> Maybe ContainerID
162toContainerID t =
123toContainerID t =
163 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
124 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -165,16 +126,12 @@ toContainerID t =
169newtype ImageID = ImageID Text
129newtype ImageID = ImageID Text
170 deriving (Eq, Show)
130 deriving (Eq, Show)
172−-- | Used for extracting the id of the image from the newtype.
173fromImageID :: ImageID -> Text
132fromImageID :: ImageID -> Text
174fromImageID (ImageID t) = t
133fromImageID (ImageID t) = t
176−-- | Helper function used for parsing a Text value into an ImageID. For now
177−-- just basic validation is used.
178toImageID :: Text -> Maybe ImageID
135toImageID :: Text -> Maybe ImageID
179toImageID t =
136toImageID t =
180 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
137 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -182,26 +139,9 @@ toImageID t =
185−-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
142data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
188−data StatusCode = StatusCode Int
190−instance ToJSON StatusCode where
191− toJSON (StatusCode c) = object ["StatusCode" .= c]
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)
199− fail "Unknown exit code"
200− parseJSON _ = fail "Unknown exit code"
202-- TODO: Add more Signals or use an existing lib
144-- 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.
205data Signal = SIGHUP
145data Signal = SIGHUP
207 | SIGQUIT
147 | SIGQUIT
@@ -213,16 +153,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
154instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
155 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
156+ 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 "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
158 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
159 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
160 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
161+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
163instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
164+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
165+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
166 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
167 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
168 toJSON SIGTERM = "SIGTERM"
@@ -250,19 +190,17 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
190 , processLabel :: Text
251 , resolveConfPath :: FilePath
191 , resolveConfPath :: FilePath
252 , restartCount :: Int
192 , restartCount :: Int
253− , containerDetailsState :: ContainerState
193+ , state :: ContainerState
254 , mounts :: [Mount]
194 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
196 deriving (Eq, Show, Generic)
258−-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
198data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
199+ mountName :: Text
262 , mountSource :: FilePath
200 , mountSource :: FilePath
263 , mountDestination :: FilePath
201 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
202+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
203+ , mountMode :: Text -- Note: Improve this?
266 , mountRW :: Bool
204 , mountRW :: Bool
267 , mountPropogation :: Text
205 , mountPropogation :: Text
@@ -270,18 +208,16 @@ data Mount = Mount {
271instance FromJSON Mount where
209instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
210 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
211+ name <- o .: "Name"
274 src <- o .: "Source"
212 src <- o .: "Source"
275 dest <- o .: "Destination"
213 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
214+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
215+ mode <- o .: "Mode"
278 rw <- o .: "RW"
216 rw <- o .: "RW"
279 prop <- o .: "Propagation"
217 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
218+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
219 parseJSON _ = fail "Mount is not an object"
283−-- | Data type used for parsing the container state from a list of
285data ContainerState = ContainerState {
221data ContainerState = ContainerState {
286 containerError :: Text
222 containerError :: Text
287 , exitCode :: Int
223 , exitCode :: Int
@@ -293,7 +229,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
229 , restarting :: Bool
294 , running :: Bool
230 , running :: Bool
295 , startedAt :: UTCTime
231 , startedAt :: UTCTime
296− , state :: State
232+ , status :: Status
298 deriving (Eq, Show, Generic)
234 deriving (Eq, Show, Generic)
@@ -313,30 +249,23 @@ instance FromJSON ContainerState where
313 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
249 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
314 parseJSON _ = fail "ContainerState is not an object"
250 parseJSON _ = fail "ContainerState is not an object"
317−-- | Client options used to configure the remote engine we're talking to
318data DockerClientOpts = DockerClientOpts {
252data DockerClientOpts = DockerClientOpts {
319 apiVer :: ApiVersion
253 apiVer :: ApiVersion
320 , baseUrl :: URL
254 , baseUrl :: URL
322 deriving (Eq, Show)
256 deriving (Eq, Show)
324−-- | Default "DockerClientOpts" used for talking to the docker engine.
325defaultClientOpts :: DockerClientOpts
258defaultClientOpts :: DockerClientOpts
326defaultClientOpts = DockerClientOpts {
259defaultClientOpts = DockerClientOpts {
327 apiVer = "v1.24"
260 apiVer = "v1.24"
328 , baseUrl = "http://127.0.0.1:2375"
261 , baseUrl = "http://127.0.0.1:2375"
331−-- | List options used for filtering the list of container or images.
332data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
264data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
334−-- | Default "ListOpts". Doesn't list stopped containers.
335defaultListOpts :: ListOpts
266defaultListOpts :: ListOpts
336defaultListOpts = ListOpts { all=False }
267defaultListOpts = ListOpts { all=False }
338−-- | Data type used for represneting the version of the docker engine
340data DockerVersion = DockerVersion {
269data DockerVersion = DockerVersion {
341 version :: Text
270 version :: Text
342 , apiVersion :: ApiVersion
271 , apiVersion :: ApiVersion
@@ -406,8 +335,6 @@ instance FromJSON ImageID where
406 return iid
335 return iid
407 parseJSON _ = fail "ImageID is not an object."
336 parseJSON _ = fail "ImageID is not an object."
409−-- | Data type used for representing the information of various ports that
410−-- a contianer may expose.
411data ContainerPortInfo = ContainerPortInfo {
338data ContainerPortInfo = ContainerPortInfo {
412 ipAddressInfo :: Maybe Text
339 ipAddressInfo :: Maybe Text
413 , privatePortInfo :: Port
340 , privatePortInfo :: Port
@@ -424,8 +351,6 @@ instance FromJSON ContainerPortInfo where
424 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
351 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
426-- For inspecting container details.
353-- For inspecting container details.
427−-- | Data type used for parsing the network information of each container
428−-- when listing them.
429data NetworkOptions = NetworkOptions {
354data NetworkOptions = NetworkOptions {
430-- ipamConfig :: Maybe Text -- Don't see in 1.24
355-- ipamConfig :: Maybe Text -- Don't see in 1.24
431-- , links :: Maybe Text -- Don't see in 1.24
356-- , links :: Maybe Text -- Don't see in 1.24
@@ -455,28 +380,29 @@ instance FromJSON NetworkOptions where
455 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
380 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
456 parseJSON _ = fail "NetworkOptions is not an object"
381 parseJSON _ = fail "NetworkOptions is not an object"
458−-- TODO: Not sure what this is used for anymore.
383+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
459−data Network = Network NetworkMode NetworkOptions
460 deriving (Eq, Show)
384 deriving (Eq, Show)
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
386+instance FromJSON Networks where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
387+ parseJSON (JSON.Object o) = do
388+ Networks <$> HM.foldlWithKey' f (return M.empty) o
465 f accM k' v' = do
391 f accM k' v' = do
466 acc <- accM
392 acc <- accM
467 k <- parseJSON $ JSON.String k'
393 k <- parseJSON $ JSON.String k'
468 v <- parseJSON v'
394 v <- parseJSON v'
469− return $ (Network k v):acc
395+ return $ M.insert k v acc
470 parseJSON _ = fail "Networks is not an object"
397 parseJSON _ = fail "Networks is not an object"
472−-- | Data type reprsenting the various network settings a container can have.
473data NetworkSettings = NetworkSettings {
399data NetworkSettings = NetworkSettings {
474 networkSettingsBridge :: Text
400 networkSettingsBridge :: Text
475 , networkSettingsSandboxId :: Text
401 , networkSettingsSandboxId :: Text
476 , networkSettingsHairpinMode :: Bool
402 , networkSettingsHairpinMode :: Bool
477 , networkSettingsLinkLocalIPv6Address :: Text
403 , networkSettingsLinkLocalIPv6Address :: Text
478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
404 , networkSettingsLinkLocalIPv6PrefixLen :: Int
479− , networkSettingsPorts :: [PortBinding]
405+ , networkSettingsPorts :: PortBindings
480 , networkSettingsSandboxKey :: Text
406 , networkSettingsSandboxKey :: Text
481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
407 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
408 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -488,7 +414,7 @@ data NetworkSettings = NetworkSettings {
488 , networkSettingsIpPrefixLen :: Int
414 , networkSettingsIpPrefixLen :: Int
489 , networkSettingsIpv6Gateway :: Text
415 , networkSettingsIpv6Gateway :: Text
490 , networkSettingsMacAddress :: Text
416 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
417+ , networkSettingsNetworks :: Networks
493 deriving (Eq, Show)
419 deriving (Eq, Show)
@@ -515,7 +441,6 @@ instance FromJSON NetworkSettings where
515 return $ NetworkSettings bridge sandbox hairpin localIP6 localIP6Len ports sandboxKey secondaryIP secondayIP6 endpointID gateway globalIP6 globalIP6Len ip ipLen ip6Gateway mac networks
441 return $ NetworkSettings bridge sandbox hairpin localIP6 localIP6Len ports sandboxKey secondaryIP secondayIP6 endpointID gateway globalIP6 globalIP6Len ip ipLen ip6Gateway mac networks
516 parseJSON _ = fail "NetworkSettings is not an object."
442 parseJSON _ = fail "NetworkSettings is not an object."
518−-- | Data type used for parsing a list of containers.
519data Container = Container
444data Container = Container
520 { containerId :: ContainerID
445 { containerId :: ContainerID
521 , containerNames :: [Text]
446 , containerNames :: [Text]
@@ -523,23 +448,21 @@ data Container = Container
523 , containerImageId :: ImageID
448 , containerImageId :: ImageID
524 , containerCommand :: Text
449 , containerCommand :: Text
525 , containerCreatedAt :: Int
450 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
451+ , containerStatus :: Status
528 , containerPorts :: [ContainerPortInfo]
452 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
453+ , containerLabels :: Labels
530− , containerNetworks :: [Network]
454+ , containerNetworks :: Networks
531 , containerMounts :: [Mount]
455 , containerMounts :: [Mount]
532 } deriving (Show, Eq)
456 } deriving (Show, Eq)
534instance FromJSON Container where
458instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
459+ parseJSON (JSON.Object v) =
536− Container <$> parseJSON o
460+ Container <$> (v .: "Id")
537 <*> (v .: "Names")
461 <*> (v .: "Names")
538 <*> (v .: "Image")
462 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
463+ <*> (v .: "ImageID")
540− <*> (v .: "Command") -- Doesn't exist anymore
464+ <*> (v .: "Command")
541 <*> (v .: "Created")
465 <*> (v .: "Created")
543 <*> (v .: "Status")
466 <*> (v .: "Status")
544 <*> (v .: "Ports")
467 <*> (v .: "Ports")
545 <*> (v .: "Labels")
468 <*> (v .: "Labels")
@@ -549,124 +472,65 @@ instance FromJSON Container where
549 parseNetworks (JSON.Object v) =
472 parseNetworks (JSON.Object v) =
550 (v .: "Networks") >>= parseJSON
473 (v .: "Networks") >>= parseJSON
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
474 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
476 parseJSON _ = fail "Container: Not a JSON object."
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
478+data Status = Created | Restarting | Running | Paused | Exited | Dead
556 deriving (Eq, Show, Generic)
479 deriving (Eq, Show, Generic)
558−instance FromJSON State where
481+instance FromJSON Status where
559− parseJSON (JSON.String "running") = return Running
482+ parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
483+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561 parseJSON (JSON.String "restarting") = return Restarting
484 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
485+ parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
486+ parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
487+ parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
488+ parseJSON _ = fail "Unknown Status"
567−-- | Alias for representing a RepoDigest. We could newtype this and add
569type Digest = Text
490type Digest = Text
571−-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
492+newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
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
494+instance FromJSON Labels where
578− toJSON [] = emptyJsonObject
495+ parseJSON val = Labels <$> parseJSON val
579− toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580− where key (Label k _) = T.unpack k
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
497+instance ToJSON Labels where
584− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
498+ toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
585− where f accM k v = do
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."
593type Tag = Text
500type Tag = Text
595−-- | Data type used for parsing information from a list of images.
596data Image = DockerImage {
502data Image = DockerImage {
597 imageId :: ImageID
503 imageId :: ImageID
598 , imageCreated :: Integer
504 , imageCreated :: Integer
599 , imageParentId :: Maybe ImageID
505 , imageParentId :: Maybe ImageID
600 , imageRepoTags :: [Tag]
506 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
507+ , imageRepoDigests :: Maybe [Digest]
602 , imageSize :: Integer
508 , imageSize :: Integer
603 , imageVirtualSize :: Integer
509 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
510+ , imageLabels :: Maybe Labels
605 } deriving (Show, Eq, Generic)
511 } deriving (Show, Eq, Generic)
607−-- | Helper function used for dropping the "image" prefix when serializing
608−-- the Image data type to and from json.
609dropImagePrefix :: [a] -> [a]
513dropImagePrefix :: [a] -> [a]
610dropImagePrefix = drop 5
514dropImagePrefix = drop 5
613instance FromJSON Image where
516instance FromJSON Image where
614− parseJSON (JSON.Object o) = do
517+ parseJSON = genericParseJSON defaultOptions {
615− imageId <- o .: "Id"
518+ fieldLabelModifier = dropImagePrefix}
616− imageCreated <- o .: "Created"
519+
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."
626−-- | Alias for Aliases.
629−-- | EndpointsConfig is container configuration for a specific network
630−newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
632−instance ToJSON EndpointConfig where
633− toJSON (EndpointConfig aliases) = JSON.object
634− [ "Aliases" .= aliases
637−-- | Alias for endpoint name
638−type EndpointName = Text
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)
645−instance ToJSON NetworkingConfig where
646− toJSON (NetworkingConfig endpointsConfig) = JSON.object
647− [ "EndpointsConfig" .= endpointsConfig
650−-- | Options used for creating a Container.
651data CreateOpts = CreateOpts {
520data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
521+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
522+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
523 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
525instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
526+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
527 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
528 let hcJSON = toJSON hc
661 case ccJSON of
529 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
530 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
531+ JSON.Object $ HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
532 _ -> error "ContainerConfig is not an object." -- This should never happen.
668−-- | Container configuration used for creating a container with sensible
670defaultContainerConfig :: Text -> ContainerConfig
534defaultContainerConfig :: Text -> ContainerConfig
671defaultContainerConfig imageName = ContainerConfig {
535defaultContainerConfig imageName = ContainerConfig {
672 hostname=Nothing
536 hostname=Nothing
@@ -676,29 +540,28 @@ defaultContainerConfig imageName = ContainerConfig {
676 , attachStdout=False
540 , attachStdout=False
677 , image=imageName
541 , image=imageName
678 , attachStderr=False
542 , attachStderr=False
679− , exposedPorts=[]
543+ , exposedPorts=Nothing -- ExposedPorts M.empty
680 , tty=False
544 , tty=False
681 , openStdin=False
545 , openStdin=False
682 , stdinOnce=False
546 , stdinOnce=False
685− , volumes=[]
549+ , volumes=Nothing
686 , workingDir=Nothing
550 , workingDir=Nothing
687− , entrypoint=Entrypoint []
551+ , entrypoint=Nothing
688 , networkDisabled=Nothing
552 , networkDisabled=Nothing
689 , macAddress=Nothing
553 , macAddress=Nothing
690− , labels=[]
554+ , labels=Nothing
691 , stopSignal=SIGTERM
555 , stopSignal=SIGTERM
694−-- | Default host confiratuon used for creating a container.
695defaultHostConfig :: HostConfig
558defaultHostConfig :: HostConfig
696defaultHostConfig = HostConfig {
559defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
561 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
562+ , logConfig=LogDriverConfig JsonFile Nothing
700− , networkMode=NetworkBridge
563+ , networkMode=Bridge
701− , portBindings=[]
564+ , portBindings=PortBindings []
702 , restartPolicy=RestartOff
565 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
566 , volumeDriver=Nothing
704 , volumesFrom=[]
567 , volumesFrom=[]
@@ -719,7 +582,6 @@ defaultHostConfig = HostConfig {
719 , resources=defaultContainerResources
582 , resources=defaultContainerResources
722−-- Default container resource contstraints (None).
723defaultContainerResources :: ContainerResources
585defaultContainerResources :: ContainerResources
724defaultContainerResources = ContainerResources {
586defaultContainerResources = ContainerResources {
725 cpuShares=Nothing
587 cpuShares=Nothing
@@ -737,80 +599,34 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
599 , memory=Nothing
738 , memoryReservation=Nothing
600 , memoryReservation=Nothing
739 , memorySwap=Nothing
601 , memorySwap=Nothing
740− , oomKillDisable=Just False
602+ , oomKillDisable=False
741 , ulimits=[]
603 , ulimits=[]
744−-- | Default create options when creating a container. You only need to
606+
745−-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
607defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
608+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
753−-- | Override the key sequence for detaching a container.
610+-- detachKeys – Override the key sequence for detaching a container.
754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
611-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
755data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
612data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
757−-- | Options for starting a container.
758data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
614data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
760−-- | Default options for staring a container.
761defaultStartOpts :: StartOpts
616defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
617defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764−-- | Options for deleting a container.
619+data DeleteOpts = DeleteOpts {
765−data ContainerDeleteOpts = ContainerDeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
620 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
621 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
622 } deriving (Eq, Show)
770−-- TODO: Add support for container build constraints
624+defaultDeleteOpts :: DeleteOpts
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)
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
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
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
625+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
798−-- | Image delete opts
799−data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
801−-- | Sane image deletion defaults
802−defaultImageDeleteOpts :: ImageDeleteOpts
803−defaultImageDeleteOpts = ImageDeleteOpts
805−-- | Timestamp alias.
806−type Timestamp = Integer
808−-- | Used for requesting N number of lines when tailing a containers log
627+type Timestamp = Integer
810data TailLogOpt = Tail Integer | All deriving (Eq, Show)
628data TailLogOpt = Tail Integer | All deriving (Eq, Show)
813−-- | Log options used when requesting the log output from a container.
814data LogOpts = LogOpts {
630data LogOpts = LogOpts {
815 stdout :: Bool
631 stdout :: Bool
816 , stderr :: Bool
632 , stderr :: Bool
@@ -819,7 +635,6 @@ data LogOpts = LogOpts {
819 , tail :: TailLogOpt
635 , tail :: TailLogOpt
820 } deriving (Eq, Show)
636 } deriving (Eq, Show)
822−-- | Sensible default for log options.
823defaultLogOpts :: LogOpts
638defaultLogOpts :: LogOpts
824defaultLogOpts = LogOpts { stdout = True
639defaultLogOpts = LogOpts { stdout = True
825 , stderr = True
640 , stderr = True
@@ -828,87 +643,37 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
643 , tail = All
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)
840−-- | Sensible defalut for create network options
841−defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842−defaultCreateNetworkOpts name =
844− { createNetworkName = name
845− , createNetworkCheckDuplicate = False
846− , createNetworkDriver = "bridge"
847− , createNetworkInternal = True
848− , createNetworkEnableIPv6 = False
851−instance ToJSON CreateNetworkOpts where
854− [ "Name" .= createNetworkName opts
855− , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856− , "Driver" .= createNetworkDriver opts
857− , "Internal" .= createNetworkInternal opts
858− , "EnableIPv6" .= createNetworkEnableIPv6 opts
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)
646+data VolumePermission = Rw | Ro deriving (Eq, Show, Generic)
865−instance ToJSON VolumePermission where
866− toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
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"
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
881−-- The CLI example is:
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"
887−newtype Volume = Volume FilePath deriving (Eq, Show)
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
890− toJSON [] = emptyJsonObject
891− toJSON (v:vs) = toJsonKey (v:vs) getKey
892− where getKey (Volume v) = v
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"
900−data Bind = Bind { hostSrc :: Text
901− , containerDest :: Text
902− , volumePermission :: Maybe VolumePermission
903− } deriving (Eq, Show)
648+-- instance ToJSON VolumePermission where
649+-- toJSON = error "TODO"
650+-- instance FromJSON VolumePermission where
651+-- parseJSON = error "TODO"
653+-- Note: Note really sure what this should be (1.24).
654+-- This is not the same as [Volume] in HostConfig.
655+newtype Volumes = Volumes [Text] -- [Volume]
905−instance FromJSON Bind where
658+instance FromJSON Volumes where
659+ parseJSON (JSON.Object o) = return $ Volumes $ HM.keys o
660+ parseJSON _ = fail "Volumes is not an object"
662+instance ToJSON Volumes where
663+ toJSON (Volumes vs) = toJSON vs
665+data Volume = Volume { hostSrc :: Text
666+ , containerDest :: Text
667+ , volumePermission :: Maybe VolumePermission
668+ } deriving (Eq, Show)
670+instance FromJSON Volume where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
671 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
672+ [src, dest] -> return $ Volume src dest Nothing
908− [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
673+ [src, dest, "rw"] -> return $ Volume src dest $ Just Rw
909− [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
674+ [src, dest, "ro"] -> return $ Volume src dest $ Just Ro
910− _ -> fail "Could not parse Bind"
675+ _ -> fail "Could not parse Volume"
911− parseJSON _ = fail "Bind is not a string"
676+ parseJSON _ = fail "Volume is not a string"
913data Device = Device {
678data Device = Device {
914 pathOnHost :: FilePath
679 pathOnHost :: FilePath
@@ -930,19 +695,19 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
696instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
697 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
698+ [vol] -> return $ VolumeFrom vol Nothing
934− [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
699+ [vol, "rw"] -> return $ VolumeFrom vol $ Just Rw
935− [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
700+ [vol, "ro"] -> return $ VolumeFrom vol $ Just Ro
936− _ -> fail "Could not parse VolumeFrom"
701+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
702 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
704instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
705 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
706+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
707 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944−instance ToJSON Bind where
709+instance ToJSON Volume where
945− toJSON (Bind src dest mode) = toJSON $ case mode of
710+ toJSON (Volume src dest mode) = toJSON $ case mode of
946 Nothing -> T.concat[src, ":", dest]
711 Nothing -> T.concat[src, ":", dest]
947 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
712 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
@@ -950,63 +715,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
716instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
717 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
718+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
719 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
720+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
721 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
723instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
724 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
725 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
726+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
728-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
729data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
731instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
732 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
733+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
734+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
735+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
736+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
737+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
738+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
739+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
740+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
741+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
743instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
744+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
745+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
746+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
747+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
748+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
749+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
750+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
751+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
752 toJSON LoggingDisabled = JSON.String "none"
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
754+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
756+instance FromJSON LogDriverOptions where
992− toJSON [] = emptyJsonObject
757+ parseJSON (JSON.Object o) = do
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
758+ LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
994− where key (LogDriverOption n _) = T.unpack n
995− val (LogDriverOption _ v) = v
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
760+ where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
761+ f accM k (JSON.String v) = do
1000 acc <- accM
762 acc <- accM
1001− value <- parseJSON v
763+ return $ M.insert k v acc
1002− return $ (LogDriverOption k value):acc
764+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
1003− parseJSON JSON.Null = return []
766+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
767+ parseJSON _ = fail "LogDriverOptions is not an object"
769+instance ToJSON LogDriverOptions where
770+ toJSON (LogDriverOptions mp) = toJSON mp
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
772+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1008instance ToJSON LogDriverConfig where
774instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
775 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1012instance FromJSON LogDriverConfig where
777instance FromJSON LogDriverConfig where
@@ -1017,47 +782,21 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
782 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
784-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
785+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
786 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
788instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
789+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
790+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
791+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
792+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
794instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
795+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
796+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
797 toJSON NetworkDisabled = JSON.String "none"
1034− toJSON (NetworkNamed n) = JSON.String n
1036−newtype NetworkID = NetworkID Text
1037− deriving (Eq, Show)
1039−-- | Used for extracting the id of the container from the newtype
1040−fromNetworkID :: NetworkID -> Text
1041−fromNetworkID (NetworkID t) = t
1043−-- | Used for parsing a Text value into a NetworkID.
1044−toNetworkID :: Text -> Maybe NetworkID
1045−toNetworkID t = Just $ NetworkID t
1047−instance FromJSON NetworkID where
1048− parseJSON (JSON.Object o) = do
1050− return $ NetworkID nid
1051− parseJSON _ = fail "NetworkID is not an object."
1053−instance ToJSON NetworkID where
1054− toJSON (NetworkID nid) = object ["Id" .= nid]
1056−data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
799+data PortType = TCP | UDP deriving (Eq, Show, Generic, Read, Ord)
1058−instance Show PortType where
1062instance ToJSON PortType where
801instance ToJSON PortType where
1063 toJSON TCP = "tcp"
802 toJSON TCP = "tcp"
@@ -1067,7 +806,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
806 parseJSON val = case val of
1068 "tcp" -> return TCP
807 "tcp" -> return TCP
1069 "udp" -> return UDP
808 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
809+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
811-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1082,8 +821,9 @@ instance FromJSON PortType where
1082-- host system s that the service running in the container can be accessed from
821-- host system s that the service running in the container can be accessed from
1083-- the outside world. We either map a port onto all interfaces (default) or onto a specific
822-- the outside world. We either map a port onto all interfaces (default) or onto a specific
1084-- interface like `127.0.0.1`.
823-- interface like `127.0.0.1`.
1085−-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
824+newtype PortBindings = PortBindings [PortBinding]
1086−-- instance will only send the last one.
825+ deriving (Eq, Show)
1087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
827-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1088data PortBinding = PortBinding {
828data PortBinding = PortBinding {
1089 containerPort :: Port
829 containerPort :: Port
@@ -1091,65 +831,17 @@ data PortBinding = PortBinding {
1091 , hostPorts :: [HostPort]
831 , hostPorts :: [HostPort]
1092 } deriving (Eq, Show)
832 } deriving (Eq, Show)
1094portAndType2Text :: Port -> PortType -> Text
835portAndType2Text :: Port -> PortType -> Text
1095portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
836portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
838+instance ToJSON PortBinding where
839+ toJSON (PortBinding {..}) = object [portAndType2Text containerPort portType .= hostPorts]
841+instance FromJSON PortBindings where
842+ parseJSON (JSON.Object o) = do
843+ PortBindings <$> HM.foldlWithKey' f (return []) o
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
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
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
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
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
1132−-- | A convenience function that adds PortBindings to and exiting
1133−-- "CreateOpts" record. Useful with 'defaultCreateOpts'
1136−-- >>> 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]}}
1140− where hc = hostConfig c
1141− pbs = portBindings $ hostConfig c
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
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1152− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1154 f accM k v = case T.split (== '/') k of
846 f accM k v = case T.split (== '/') k of
1155 [port', portType'] -> do
847 [port', portType'] -> do
@@ -1158,15 +850,13 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158 acc <- accM
850 acc <- accM
1159 hps <- parseJSON v
851 hps <- parseJSON v
1160 return $ (PortBinding port portType hps):acc
852 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
854+ fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
1163 parseJSON _ = fail "PortBindings is not an object"
855 parseJSON _ = fail "PortBindings is not an object"
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
857+instance ToJSON PortBindings where
1166− toJSON [] = emptyJsonObject
858+ toJSON (PortBindings []) = JSON.Object HM.empty
1167− toJSON (p:ps) = toJsonKeyVal (p:ps) key val
859+ toJSON (PortBindings (p:ps)) = toJSON (p:ps)
1168− where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1169− val p = hostPorts p
1171data HostPort = HostPort {
861data HostPort = HostPort {
1172 hostIp :: Text
862 hostIp :: Text
@@ -1184,6 +874,24 @@ instance FromJSON HostPort where
1184 return $ HostPort i p
874 return $ HostPort i p
1185 parseJSON _ = fail "HostPort is not an object."
875 parseJSON _ = fail "HostPort is not an object."
877+-- newtype HostPorts = HostPorts [HostPort]
878+-- deriving (Eq, Show)
880+-- instance ToJSON HostPorts where
881+-- toJSON (HostPorts hps) = toJSON hps
883+-- instance FromJSON HostPorts where
884+-- parseJSON (JSON.Object o) = do
885+-- HostPorts <$> HM.foldlWithKey' f (return []) o
891+-- p <- parseIntegerText p'
892+-- return $ (HostPort (NetworkInterface k) p):acc
893+-- parseJSON _ = fail $ "HostPorts is not an object"
1187-- { "Name": "on-failure" , "MaximumRetryCount": 2}
895-- { "Name": "on-failure" , "MaximumRetryCount": 2}
1188type RetryCount = Integer
896type RetryCount = Integer
1189data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
897data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
@@ -1197,7 +905,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
905 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
906 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
907 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
908+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
909 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
910 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +913,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
913 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
914 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
915 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
916+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
918data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1215,11 +923,11 @@ newtype UTSMode = UTSMode Text deriving (Eq, Show)
1215-- TODO: Add UTSMode : UTS namespace to use for the container
923-- TODO: Add UTSMode : UTS namespace to use for the container
1216-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
924-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
1217data HostConfig = HostConfig
925data HostConfig = HostConfig
1218− { binds :: [Bind]
926+ { binds :: [Volume]
1219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
927 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1220 , logConfig :: LogDriverConfig
928 , logConfig :: LogDriverConfig
1221 , networkMode :: NetworkMode
929 , networkMode :: NetworkMode
1222− , portBindings :: [PortBinding]
930+ , portBindings :: PortBindings
1223 , restartPolicy :: RestartPolicy
931 , restartPolicy :: RestartPolicy
1224 , volumeDriver :: Maybe Text
932 , volumeDriver :: Maybe Text
1225 , volumesFrom :: [VolumeFrom]
933 , volumesFrom :: [VolumeFrom]
@@ -1378,22 +1086,6 @@ instance ToJSON DeviceRate where
1378 , "Rate" .= r
1086 , "Rate" .= r
1381−data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1383−data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
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
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"
1397data ContainerResources = ContainerResources {
1089data ContainerResources = ContainerResources {
1398 cpuShares :: Maybe Integer
1090 cpuShares :: Maybe Integer
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1091 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1101,12 @@ data ContainerResources = ContainerResources {
1409 , cpusetMems :: Maybe Text
1101 , cpusetMems :: Maybe Text
1410 , devices :: [Device]
1102 , devices :: [Device]
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1103 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1104+ , kernelMemory :: Maybe Integer
1413− , memory :: Maybe MemoryConstraint
1105+ , memory :: Maybe Integer
1414− , memoryReservation :: Maybe MemoryConstraint
1106+ , memoryReservation :: Maybe Integer
1415− , memorySwap :: Maybe MemoryConstraint
1107+ , memorySwap :: Maybe Integer
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1108 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1109+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1110 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1111 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1112 -- TODO: Missing from 1.24
@@ -1452,59 +1144,41 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1144 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1146instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1147+ toJSON (EnvVar n v) = object [n .= v]
1457−-- | ExposedPort represents a port (and it's type)
1149+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1458-- that a container should expose to other containers or the host system.
1150-- that a container should expose to other containers or the host system.
1459−-- `NOTE`: This does not automatically expose the port onto the host
1151+-- `NOTE`: This does not automatically expose the ports onto the host
1460−-- system but rather it just tags it. It's best to be used with
1152+-- system but rather it just tags them. It's best to be used with
1461-- the PublishAllPorts flag. It is also useful for
1153-- the PublishAllPorts flag. It is also useful for
1462-- the daemon to know which Environment variables to
1154-- the daemon to know which Environment variables to
1463-- inject into a container linking to our container.
1155-- inject into a container linking to our container.
1464-- Example linking a Postgres container named db would inject the following
1156-- Example linking a Postgres container named db would inject the following
1465-- environment variables automatically if we set the corresponding
1157-- environment variables automatically if we set the corresponding
1466−--
1158+-- ExposedPorts:
1470-- DB_PORT_5432_TCP_PORT="5432"
1159-- DB_PORT_5432_TCP_PORT="5432"
1471-- DB_PORT_5432_TCP_PROTO="tcp"
1160-- DB_PORT_5432_TCP_PROTO="tcp"
1472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1161-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1162+newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1163+-- JP: Should this be ExposedPorts [(Port, PortType)]?
1165+instance FromJSON ExposedPorts where
1166+ parseJSON (JSON.Object o) = do
1167+ ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1479 f accM k _ = case T.split (== '/') k of
1170 f accM k _ = case T.split (== '/') k of
1480 [port', portType'] -> do
1171 [port', portType'] -> do
1481 port <- parseIntegerText port'
1172 port <- parseIntegerText port'
1482 portType <- parseJSON $ JSON.String portType'
1173 portType <- parseJSON $ JSON.String portType'
1483 acc <- accM
1174 acc <- accM
1484− return $ (ExposedPort port portType):acc
1175+ return $ M.insert port portType acc
1485− _ -> fail "Could not parse ExposedPorts"
1177+ fail "Could not parse ExposedPorts"
1486− parseJSON (JSON.Null) = return []
1487− parseJSON _ = fail "ExposedPorts is not an object"
1178+ parseJSON _ = fail "ExposedPorts is not an object."
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 "/"
1495−data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1497−instance ToJSON Entrypoint where
1180+instance ToJSON ExposedPorts where
1498− toJSON (Entrypoint (e:es)) = toJSON (e:es)
1181+ toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
1499− toJSON (Entrypoint []) = JSON.Null
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"
1510data ContainerConfig = ContainerConfig {
1184data ContainerConfig = ContainerConfig {
@@ -1514,7 +1188,7 @@ data ContainerConfig = ContainerConfig {
1514 , attachStdin :: Bool
1188 , attachStdin :: Bool
1515 , attachStdout :: Bool
1189 , attachStdout :: Bool
1516 , attachStderr :: Bool
1190 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1191+ , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
1518 -- , publishService :: Text -- Don't see this in 1.24
1192 -- , publishService :: Text -- Don't see this in 1.24
1519 , tty :: Bool
1193 , tty :: Bool
1520 , openStdin :: Bool
1194 , openStdin :: Bool
@@ -1523,70 +1197,27 @@ data ContainerConfig = ContainerConfig {
1523 , cmd :: [Text]
1197 , cmd :: [Text]
1524 -- , argsEscaped :: Bool -- Don't see this in 1.24
1198 -- , argsEscaped :: Bool -- Don't see this in 1.24
1525 , image :: Text
1199 , image :: Text
1526− , volumes :: [Volume]
1200+ , volumes :: Maybe Volumes
1527 , workingDir :: Maybe FilePath
1201 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1202+ , entrypoint :: Maybe Text -- Can be null?
1529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1203 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1204 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1205 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1206+ , labels :: Maybe Labels
1533 , stopSignal :: Signal
1207 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1208 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1210instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1211 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1212 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1541instance FromJSON ContainerConfig where
1214instance FromJSON ContainerConfig where
1542− parseJSON (JSON.Object o) = do
1215+ parseJSON = genericParseJSON defaultOptions {
1543− hostname <- o .:? "Hostname"
1216+ fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1544− domainname <- o .:? "Domainname"
1545− user <- o .:? "User"
1546− attachStdin <- o .: "AttachStdin"
1547− attachStdout <- o .: "AttachStdout"
1548− attachStderr <- o .: "AttachStderr"
1549− exposedPorts <- o .:? "ExposedPorts" .!= []
1551− openStdin <- o .: "OpenStdin"
1552− stdinOnce <- o .: "StdinOnce"
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."
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1218parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1219parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1220 Nothing ->
1574 fail "Could not parse Integer"
1221 fail "Could not parse Integer"
1575 Just i ->
1222 Just i ->
1576 return i
1223 return i
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
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
1590−-- | Helper function that return an empty dictionary "{}"
1591−emptyJsonObject :: JSON.Value
1592−emptyJsonObject = JSON.Object HM.empty