@@ -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,42 @@ 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(..)
45 , Device(..)
57 , ContainerName
46 , ContainerName
58 , VolumeFrom(..)
47 , VolumeFrom(..)
59 , Link(..)
48 , Link(..)
60 , LogDriverType(..)
49 , LogDriverType(..)
61− , LogDriverOption(..)
50+ , LogDriverOptions(..)
62 , LogDriverConfig(..)
51 , LogDriverConfig(..)
63 , NetworkMode(..)
52 , NetworkMode(..)
64 , PortType(..)
53 , PortType(..)
65-- , NetworkInterface(..)
54-- , NetworkInterface(..)
66− , Network(..)
55+ , Networks(..)
67 , NetworkSettings(..)
56 , NetworkSettings(..)
68 , NetworkOptions(..)
57 , NetworkOptions(..)
69 , Mount(..)
58 , Mount(..)
70 , PortBinding(..)
59 , PortBinding(..)
71 , HostPort(..)
61 , HostPort(..)
72 , RetryCount
62 , RetryCount
73 , RestartPolicy(..)
63 , RestartPolicy(..)
@@ -75,8 +65,6 @@ module Docker.Client.Types (
75 , UTSMode(..)
65 , UTSMode(..)
76 , HostConfig(..)
66 , HostConfig(..)
77 , defaultHostConfig
67 , defaultHostConfig
78− , NetworkingConfig(..)
80 , Ulimit(..)
68 , Ulimit(..)
81 , ContainerResources(..)
69 , ContainerResources(..)
82 , defaultContainerResources
70 , defaultContainerResources
@@ -86,18 +74,10 @@ module Docker.Client.Types (
86 , EnvVar(..)
74 , EnvVar(..)
87 , ContainerConfig(..)
75 , ContainerConfig(..)
88 , defaultContainerConfig
76 , defaultContainerConfig
89− , ExposedPort(..)
77+ , ExposedPorts(..)
90 , DeviceWeight(..)
78 , DeviceWeight(..)
91 , DeviceRate(..)
79 , DeviceRate(..)
92 , addPortBinding
80 , addPortBinding
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
83import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,57 +87,40 @@ import qualified Data.Aeson as JSON
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
87import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
108import Data.Char (isAlphaNum, toUpper)
88import Data.Char (isAlphaNum, toUpper)
109import qualified Data.HashMap.Strict as HM
89import qualified Data.HashMap.Strict as HM
90+import qualified Data.Map as M
110import Data.Monoid ((<>))
91import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
112import Data.Text (Text)
92import Data.Text (Text)
113import qualified Data.Text as T
93import qualified Data.Text as T
114import Data.Time.Clock (UTCTime)
94import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116import GHC.Generics (Generic)
95import GHC.Generics (Generic)
117import Prelude hiding (all, tail)
96import Prelude hiding (all, tail)
118import Text.Read (readMaybe)
97import Text.Read (readMaybe)
120−-- | List of Docker Engine API endpoints
121data Endpoint =
99data Endpoint =
122 VersionEndpoint
100 VersionEndpoint
123 | ListContainersEndpoint ListOpts
101 | ListContainersEndpoint ListOpts
124 | ListImagesEndpoint ListOpts
102 | ListImagesEndpoint ListOpts
125− | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
103+ | CreateContainerEndpoint CreateOpts
126 | StartContainerEndpoint StartOpts ContainerID
104 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
105 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
106 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
107 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
108 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
109 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
110 | 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.
111 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
112+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
113 | 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)
114 deriving (Eq, Show)
144−-- | We should newtype this
145type URL = Text
116type URL = Text
147−-- | We should newtype this
148type ApiVersion = Text
117type ApiVersion = Text
151−-- | ID of a contianer
152newtype ContainerID = ContainerID Text
118newtype ContainerID = ContainerID Text
153 deriving (Eq, Show)
119 deriving (Eq, Show)
155−-- | Used for extracting the id of the container from the newtype
156fromContainerID :: ContainerID -> Text
121fromContainerID :: ContainerID -> Text
157fromContainerID (ContainerID t) = t
122fromContainerID (ContainerID t) = t
159−-- | Used for parsing a Text value into a ContainerID. We apply some basic
161toContainerID :: Text -> Maybe ContainerID
124toContainerID :: Text -> Maybe ContainerID
162toContainerID t =
125toContainerID t =
163 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
126 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -165,16 +128,12 @@ toContainerID t =
169newtype ImageID = ImageID Text
131newtype ImageID = ImageID Text
170 deriving (Eq, Show)
132 deriving (Eq, Show)
172−-- | Used for extracting the id of the image from the newtype.
173fromImageID :: ImageID -> Text
134fromImageID :: ImageID -> Text
174fromImageID (ImageID t) = t
135fromImageID (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
137toImageID :: Text -> Maybe ImageID
179toImageID t =
138toImageID t =
180 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
139 if T.all (\c -> isAlphaNum c || c == ':') t then -- Note: Can we improve this whitelist?
@@ -182,26 +141,9 @@ toImageID t =
185−-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
144data 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
146-- 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
147data Signal = SIGHUP
207 | SIGQUIT
149 | SIGQUIT
@@ -213,16 +155,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
156instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
157 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
158+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
159+ parseJSON (JSON.String "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
160 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
161 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
162 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
163+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
165instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
166+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
167+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
168 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
169 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
170 toJSON SIGTERM = "SIGTERM"
@@ -250,19 +192,17 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
192 , processLabel :: Text
251 , resolveConfPath :: FilePath
193 , resolveConfPath :: FilePath
252 , restartCount :: Int
194 , restartCount :: Int
253− , containerDetailsState :: ContainerState
195+ , state :: ContainerState
254 , mounts :: [Mount]
196 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
198 deriving (Eq, Show, Generic)
258−-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
200data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
201+ mountName :: Text
262 , mountSource :: FilePath
202 , mountSource :: FilePath
263 , mountDestination :: FilePath
203 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
204+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
205+ , mountMode :: Text -- Note: Improve this?
266 , mountRW :: Bool
206 , mountRW :: Bool
267 , mountPropogation :: Text
207 , mountPropogation :: Text
@@ -270,18 +210,16 @@ data Mount = Mount {
271instance FromJSON Mount where
211instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
212 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
213+ name <- o .: "Name"
274 src <- o .: "Source"
214 src <- o .: "Source"
275 dest <- o .: "Destination"
215 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
216+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
217+ mode <- o .: "Mode"
278 rw <- o .: "RW"
218 rw <- o .: "RW"
279 prop <- o .: "Propagation"
219 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
220+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
221 parseJSON _ = fail "Mount is not an object"
283−-- | Data type used for parsing the container state from a list of
285data ContainerState = ContainerState {
223data ContainerState = ContainerState {
286 containerError :: Text
224 containerError :: Text
287 , exitCode :: Int
225 , exitCode :: Int
@@ -293,7 +231,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
231 , restarting :: Bool
294 , running :: Bool
232 , running :: Bool
295 , startedAt :: UTCTime
233 , startedAt :: UTCTime
296− , state :: State
234+ , status :: Status
298 deriving (Eq, Show, Generic)
236 deriving (Eq, Show, Generic)
@@ -313,30 +251,23 @@ instance FromJSON ContainerState where
313 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
251 return $ ContainerState err exit finished oomKilled dead paused pid restarting running started st
314 parseJSON _ = fail "ContainerState is not an object"
252 parseJSON _ = fail "ContainerState is not an object"
317−-- | Client options used to configure the remote engine we're talking to
318data DockerClientOpts = DockerClientOpts {
254data DockerClientOpts = DockerClientOpts {
319 apiVer :: ApiVersion
255 apiVer :: ApiVersion
320 , baseUrl :: URL
256 , baseUrl :: URL
322 deriving (Eq, Show)
258 deriving (Eq, Show)
324−-- | Default "DockerClientOpts" used for talking to the docker engine.
325defaultClientOpts :: DockerClientOpts
260defaultClientOpts :: DockerClientOpts
326defaultClientOpts = DockerClientOpts {
261defaultClientOpts = DockerClientOpts {
327 apiVer = "v1.24"
262 apiVer = "v1.24"
328 , baseUrl = "http://127.0.0.1:2375"
263 , 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)
266data ListOpts = ListOpts { all :: Bool } deriving (Eq, Show)
334−-- | Default "ListOpts". Doesn't list stopped containers.
335defaultListOpts :: ListOpts
268defaultListOpts :: ListOpts
336defaultListOpts = ListOpts { all=False }
269defaultListOpts = ListOpts { all=False }
338−-- | Data type used for represneting the version of the docker engine
340data DockerVersion = DockerVersion {
271data DockerVersion = DockerVersion {
341 version :: Text
272 version :: Text
342 , apiVersion :: ApiVersion
273 , apiVersion :: ApiVersion
@@ -406,8 +337,6 @@ instance FromJSON ImageID where
406 return iid
337 return iid
407 parseJSON _ = fail "ImageID is not an object."
338 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 {
340data ContainerPortInfo = ContainerPortInfo {
412 ipAddressInfo :: Maybe Text
341 ipAddressInfo :: Maybe Text
413 , privatePortInfo :: Port
342 , privatePortInfo :: Port
@@ -424,8 +353,6 @@ instance FromJSON ContainerPortInfo where
424 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
353 parseJSON _ = fail "ContainerPortInfo: Not a JSON object."
426-- For inspecting container details.
355-- For inspecting container details.
427−-- | Data type used for parsing the network information of each container
428−-- when listing them.
429data NetworkOptions = NetworkOptions {
356data NetworkOptions = NetworkOptions {
430-- ipamConfig :: Maybe Text -- Don't see in 1.24
357-- ipamConfig :: Maybe Text -- Don't see in 1.24
431-- , links :: Maybe Text -- Don't see in 1.24
358-- , links :: Maybe Text -- Don't see in 1.24
@@ -455,28 +382,29 @@ instance FromJSON NetworkOptions where
455 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
382 return $ NetworkOptions networkId endpointId gateway ip ipLen ip6Gateway globalIP6 globalIP6Len mac
456 parseJSON _ = fail "NetworkOptions is not an object"
383 parseJSON _ = fail "NetworkOptions is not an object"
458−-- TODO: Not sure what this is used for anymore.
385+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)
386 deriving (Eq, Show)
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
388+instance FromJSON Networks where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
389+ parseJSON (JSON.Object o) = do
390+ Networks <$> HM.foldlWithKey' f (return M.empty) o
465 f accM k' v' = do
393 f accM k' v' = do
466 acc <- accM
394 acc <- accM
467 k <- parseJSON $ JSON.String k'
395 k <- parseJSON $ JSON.String k'
468 v <- parseJSON v'
396 v <- parseJSON v'
469− return $ (Network k v):acc
397+ return $ M.insert k v acc
470 parseJSON _ = fail "Networks is not an object"
399 parseJSON _ = fail "Networks is not an object"
472−-- | Data type reprsenting the various network settings a container can have.
473data NetworkSettings = NetworkSettings {
401data NetworkSettings = NetworkSettings {
474 networkSettingsBridge :: Text
402 networkSettingsBridge :: Text
475 , networkSettingsSandboxId :: Text
403 , networkSettingsSandboxId :: Text
476 , networkSettingsHairpinMode :: Bool
404 , networkSettingsHairpinMode :: Bool
477 , networkSettingsLinkLocalIPv6Address :: Text
405 , networkSettingsLinkLocalIPv6Address :: Text
478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
406 , networkSettingsLinkLocalIPv6PrefixLen :: Int
479− , networkSettingsPorts :: [PortBinding]
407+ , networkSettingsPorts :: PortBindings
480 , networkSettingsSandboxKey :: Text
408 , networkSettingsSandboxKey :: Text
481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
409 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
410 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -488,7 +416,7 @@ data NetworkSettings = NetworkSettings {
488 , networkSettingsIpPrefixLen :: Int
416 , networkSettingsIpPrefixLen :: Int
489 , networkSettingsIpv6Gateway :: Text
417 , networkSettingsIpv6Gateway :: Text
490 , networkSettingsMacAddress :: Text
418 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
419+ , networkSettingsNetworks :: Networks
493 deriving (Eq, Show)
421 deriving (Eq, Show)
@@ -515,7 +443,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
443 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."
444 parseJSON _ = fail "NetworkSettings is not an object."
518−-- | Data type used for parsing a list of containers.
519data Container = Container
446data Container = Container
520 { containerId :: ContainerID
447 { containerId :: ContainerID
521 , containerNames :: [Text]
448 , containerNames :: [Text]
@@ -523,23 +450,21 @@ data Container = Container
523 , containerImageId :: ImageID
450 , containerImageId :: ImageID
524 , containerCommand :: Text
451 , containerCommand :: Text
525 , containerCreatedAt :: Int
452 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
453+ , containerStatus :: Status
528 , containerPorts :: [ContainerPortInfo]
454 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
455+ , containerLabels :: Labels
530− , containerNetworks :: [Network]
456+ , containerNetworks :: Networks
531 , containerMounts :: [Mount]
457 , containerMounts :: [Mount]
532 } deriving (Show, Eq)
458 } deriving (Show, Eq)
534instance FromJSON Container where
460instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
461+ parseJSON (JSON.Object v) =
536− Container <$> parseJSON o
462+ Container <$> (v .: "Id")
537 <*> (v .: "Names")
463 <*> (v .: "Names")
538 <*> (v .: "Image")
464 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
465+ <*> (v .: "ImageID")
540− <*> (v .: "Command") -- Doesn't exist anymore
466+ <*> (v .: "Command")
541 <*> (v .: "Created")
467 <*> (v .: "Created")
543 <*> (v .: "Status")
468 <*> (v .: "Status")
544 <*> (v .: "Ports")
469 <*> (v .: "Ports")
545 <*> (v .: "Labels")
470 <*> (v .: "Labels")
@@ -549,124 +474,65 @@ instance FromJSON Container where
549 parseNetworks (JSON.Object v) =
474 parseNetworks (JSON.Object v) =
550 (v .: "Networks") >>= parseJSON
475 (v .: "Networks") >>= parseJSON
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
476 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
478 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
480+data Status = Created | Restarting | Running | Paused | Exited | Dead
556 deriving (Eq, Show, Generic)
481 deriving (Eq, Show, Generic)
558−instance FromJSON State where
483+instance FromJSON Status where
559− parseJSON (JSON.String "running") = return Running
484+ parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
485+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561 parseJSON (JSON.String "restarting") = return Restarting
486 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
487+ parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
488+ parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
489+ parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
490+ parseJSON _ = fail "Unknown Status"
567−-- | Alias for representing a RepoDigest. We could newtype this and add
569type Digest = Text
492type Digest = Text
571−-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
494+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
496+instance FromJSON Labels where
578− toJSON [] = emptyJsonObject
497+ 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
499+instance ToJSON Labels where
584− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
500+ 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
502type Tag = Text
595−-- | Data type used for parsing information from a list of images.
596data Image = DockerImage {
504data Image = DockerImage {
597 imageId :: ImageID
505 imageId :: ImageID
598 , imageCreated :: Integer
506 , imageCreated :: Integer
599 , imageParentId :: Maybe ImageID
507 , imageParentId :: Maybe ImageID
600 , imageRepoTags :: [Tag]
508 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
509+ , imageRepoDigests :: Maybe [Digest]
602 , imageSize :: Integer
510 , imageSize :: Integer
603 , imageVirtualSize :: Integer
511 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
512+ , imageLabels :: Maybe Labels
605 } deriving (Show, Eq, Generic)
513 } 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]
515dropImagePrefix :: [a] -> [a]
610dropImagePrefix = drop 5
516dropImagePrefix = drop 5
613instance FromJSON Image where
518instance FromJSON Image where
614− parseJSON (JSON.Object o) = do
519+ parseJSON = genericParseJSON defaultOptions {
615− imageId <- o .: "Id"
520+ fieldLabelModifier = dropImagePrefix}
616− imageCreated <- o .: "Created"
521+
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 {
522data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
523+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
524+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
525 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
527instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
528+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
529 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
530 let hcJSON = toJSON hc
661 case ccJSON of
531 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
532 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
533+ 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.
534 _ -> error "ContainerConfig is not an object." -- This should never happen.
668−-- | Container configuration used for creating a container with sensible
670defaultContainerConfig :: Text -> ContainerConfig
536defaultContainerConfig :: Text -> ContainerConfig
671defaultContainerConfig imageName = ContainerConfig {
537defaultContainerConfig imageName = ContainerConfig {
672 hostname=Nothing
538 hostname=Nothing
@@ -676,29 +542,28 @@ defaultContainerConfig imageName = ContainerConfig {
676 , attachStdout=False
542 , attachStdout=False
677 , image=imageName
543 , image=imageName
678 , attachStderr=False
544 , attachStderr=False
679− , exposedPorts=[]
545+ , exposedPorts=Nothing -- ExposedPorts M.empty
680 , tty=False
546 , tty=False
681 , openStdin=False
547 , openStdin=False
682 , stdinOnce=False
548 , stdinOnce=False
685− , volumes=[]
551+ , volumes=Nothing
686 , workingDir=Nothing
552 , workingDir=Nothing
687− , entrypoint=Entrypoint []
553+ , entrypoint=Nothing
688 , networkDisabled=Nothing
554 , networkDisabled=Nothing
689 , macAddress=Nothing
555 , macAddress=Nothing
690− , labels=[]
556+ , labels=Nothing
691 , stopSignal=SIGTERM
557 , stopSignal=SIGTERM
694−-- | Default host confiratuon used for creating a container.
695defaultHostConfig :: HostConfig
560defaultHostConfig :: HostConfig
696defaultHostConfig = HostConfig {
561defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
563 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
564+ , logConfig=LogDriverConfig JsonFile Nothing
700− , networkMode=NetworkBridge
565+ , networkMode=Bridge
701− , portBindings=[]
566+ , portBindings=PortBindings []
702 , restartPolicy=RestartOff
567 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
568 , volumeDriver=Nothing
704 , volumesFrom=[]
569 , volumesFrom=[]
@@ -719,7 +584,6 @@ defaultHostConfig = HostConfig {
719 , resources=defaultContainerResources
584 , resources=defaultContainerResources
722−-- Default container resource contstraints (None).
723defaultContainerResources :: ContainerResources
587defaultContainerResources :: ContainerResources
724defaultContainerResources = ContainerResources {
588defaultContainerResources = ContainerResources {
725 cpuShares=Nothing
589 cpuShares=Nothing
@@ -737,80 +601,34 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
601 , memory=Nothing
738 , memoryReservation=Nothing
602 , memoryReservation=Nothing
739 , memorySwap=Nothing
603 , memorySwap=Nothing
740− , oomKillDisable=Just False
604+ , oomKillDisable=False
741 , ulimits=[]
605 , ulimits=[]
744−-- | Default create options when creating a container. You only need to
608+
745−-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
609defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
610+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.
612+-- 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 _.
613-- 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)
614data DetachKeys = WithCtrl Char | WithoutCtrl Char | DefaultDetachKey deriving (Eq, Show)
757−-- | Options for starting a container.
758data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
616data StartOpts = StartOpts { detachKeys :: DetachKeys } deriving (Eq, Show)
760−-- | Default options for staring a container.
761defaultStartOpts :: StartOpts
618defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
619defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764−-- | Options for deleting a container.
621+data DeleteOpts = DeleteOpts {
765−data ContainerDeleteOpts = ContainerDeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
622 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
623 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
624 } deriving (Eq, Show)
770−-- TODO: Add support for container build constraints
626+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 }
627+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
629+type Timestamp = Integer
810data TailLogOpt = Tail Integer | All deriving (Eq, Show)
630data TailLogOpt = Tail Integer | All deriving (Eq, Show)
813−-- | Log options used when requesting the log output from a container.
814data LogOpts = LogOpts {
632data LogOpts = LogOpts {
815 stdout :: Bool
633 stdout :: Bool
816 , stderr :: Bool
634 , stderr :: Bool
@@ -819,7 +637,6 @@ data LogOpts = LogOpts {
819 , tail :: TailLogOpt
637 , tail :: TailLogOpt
820 } deriving (Eq, Show)
638 } deriving (Eq, Show)
822−-- | Sensible default for log options.
823defaultLogOpts :: LogOpts
640defaultLogOpts :: LogOpts
824defaultLogOpts = LogOpts { stdout = True
641defaultLogOpts = LogOpts { stdout = True
825 , stderr = True
642 , stderr = True
@@ -828,87 +645,45 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
645 , 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)
648+data VolumePermission = Rw | Ro deriving (Eq, Show, Generic)
865−instance ToJSON VolumePermission where
650+-- instance ToJSON VolumePermission where
866− toJSON ReadWrite = "rw"
651+-- toJSON = error "TODO"
867− toJSON ReadOnly = "ro"
869−instance FromJSON VolumePermission where
652+-- instance FromJSON VolumePermission where
870− parseJSON "rw" = return ReadWrite
653+-- parseJSON = error "TODO"
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
655-- | Used for marking a directory in the container as "exposed" hence
877-- taking it outside of the COW filesystem and making it mountable
656-- taking it outside of the COW filesystem and making it mountable
878−-- in other containers using "VolumesFrom". The volume usually get's
657+-- in other containers using "VolumesFrom".
879−-- created somewhere in @/var/lib/docker/volumes@ (depending on the volume
881-- The CLI example is:
658-- The CLI example is:
884-- docker run --name app -v \/opt\/data -it myapp:latest
661-- 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"
662-- docker run --name app2 --volumes-from app \/bin\/bash -c "ls -l \/opt\/data"
887−newtype Volume = Volume FilePath deriving (Eq, Show)
664+newtype Volumes = Volumes [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
666+instance FromJSON Volumes where
895− parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
667+ parseJSON (JSON.Object o) = return $ Volumes $ map T.unpack $ HM.keys o
896− parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
668+ parseJSON _ = fail "Volumes is not an object"
670+instance ToJSON Volumes where
671+ toJSON (Volumes []) = JSON.Object HM.empty
672+ toJSON (Volumes (v:vs)) = JSON.Object $ foldl f HM.empty (v:vs)
673+ where f acc k = HM.insert (T.pack k) (JSON.Object HM.empty) acc
900−data Bind = Bind { hostSrc :: Text
675+data Volume = Volume { hostSrc :: Text
901− , containerDest :: Text
676+ , containerDest :: Text
902− , volumePermission :: Maybe VolumePermission
677+ , volumePermission :: Maybe VolumePermission
903− } deriving (Eq, Show)
678+ } deriving (Eq, Show)
905−instance FromJSON Bind where
680+instance FromJSON Volume where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
681 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
682+ [src, dest] -> return $ Volume src dest Nothing
908− [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
683+ [src, dest, "rw"] -> return $ Volume src dest $ Just Rw
909− [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
684+ [src, dest, "ro"] -> return $ Volume src dest $ Just Ro
910− _ -> fail "Could not parse Bind"
685+ _ -> fail "Could not parse Volume"
911− parseJSON _ = fail "Bind is not a string"
686+ parseJSON _ = fail "Volume is not a string"
913data Device = Device {
688data Device = Device {
914 pathOnHost :: FilePath
689 pathOnHost :: FilePath
@@ -930,19 +705,19 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
706instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
707 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
708+ [vol] -> return $ VolumeFrom vol Nothing
934− [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
709+ [vol, "rw"] -> return $ VolumeFrom vol $ Just Rw
935− [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
710+ [vol, "ro"] -> return $ VolumeFrom vol $ Just Ro
936− _ -> fail "Could not parse VolumeFrom"
711+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
712 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
714instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
715 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
716+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
717 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944−instance ToJSON Bind where
719+instance ToJSON Volume where
945− toJSON (Bind src dest mode) = toJSON $ case mode of
720+ toJSON (Volume src dest mode) = toJSON $ case mode of
946 Nothing -> T.concat[src, ":", dest]
721 Nothing -> T.concat[src, ":", dest]
947 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
722 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
@@ -950,63 +725,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
726instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
727 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
728+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
729 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
730+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
731 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
733instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
734 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
735 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
736+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
738-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
739data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
741instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
742 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
743+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
744+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
745+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
746+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
747+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
748+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
749+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
750+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
751+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
753instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
754+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
755+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
756+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
757+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
758+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
759+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
760+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
761+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
762 toJSON LoggingDisabled = JSON.String "none"
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
764+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
766+instance FromJSON LogDriverOptions where
992− toJSON [] = emptyJsonObject
767+ parseJSON (JSON.Object o) = do
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
768+ 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
770+ where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
771+ f accM k (JSON.String v) = do
1000 acc <- accM
772 acc <- accM
1001− value <- parseJSON v
1002− return $ (LogDriverOption k value):acc
773+ return $ M.insert k v acc
774+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
1003− parseJSON JSON.Null = return []
776+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
777+ parseJSON _ = fail "LogDriverOptions is not an object"
779+instance ToJSON LogDriverOptions where
780+ toJSON (LogDriverOptions mp) = toJSON mp
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
782+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1008instance ToJSON LogDriverConfig where
784instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
785 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1012instance FromJSON LogDriverConfig where
787instance FromJSON LogDriverConfig where
@@ -1017,41 +792,19 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
792 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
794-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
795+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
796 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
798instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
799+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
800+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
801+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
802+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
804instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
805+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
806+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
807 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]
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
809data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1067,7 +820,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
820 parseJSON val = case val of
1068 "tcp" -> return TCP
821 "tcp" -> return TCP
1069 "udp" -> return UDP
822 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
823+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
825-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1083,7 +836,15 @@ instance FromJSON PortType where
1083-- the outside world. We either map a port onto all interfaces (default) or onto a specific
836-- the outside world. We either map a port onto all interfaces (default) or onto a specific
1084-- interface like `127.0.0.1`.
837-- interface like `127.0.0.1`.
1085-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
838-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
1086−-- instance will only send the last one.
839+-- instnace will only send the last one.
840+newtype PortBindings = PortBindings [PortBinding]
844+instance Monoid PortBindings where
845+ mempty = PortBindings []
846+ mappend (PortBindings p1) (PortBindings p2) = PortBindings (p1 ++ p2)
1087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
848-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1088data PortBinding = PortBinding {
849data PortBinding = PortBinding {
1089 containerPort :: Port
850 containerPort :: Port
@@ -1094,62 +855,24 @@ data PortBinding = PortBinding {
1094portAndType2Text :: Port -> PortType -> Text
855portAndType2Text :: Port -> PortType -> Text
1095portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
856portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
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
858-- | A convenience function that adds PortBindings to and exiting
1133-- "CreateOpts" record. Useful with 'defaultCreateOpts'
859-- "CreateOpts" record. Useful with 'defaultCreateOpts'
1134-- Example:
860-- Example:
1136-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
862-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
1137−-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
863+-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
1138−addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
864+addPortBinding :: CreateOpts -> PortBinding -> CreateOpts
1139−addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
865+addPortBinding c pb = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1140 where hc = hostConfig c
866 where hc = hostConfig c
1141 pbs = portBindings $ hostConfig c
867 pbs = portBindings $ hostConfig c
1143−-- | Helper function for adding a "ExposedPort" to and existing
869+instance ToJSON PortBinding where
1144−-- CreateOpts record.
870+ toJSON (PortBinding {..}) = object [portAndType2Text containerPort portType .= hostPorts]
1145−addExposedPort :: ExposedPort -> CreateOpts -> CreateOpts
1146−addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1147− where cc = containerConfig c
1148− oldeps = exposedPorts cc
872+instance FromJSON PortBindings where
873+ parseJSON (JSON.Object o) = do
874+ PortBindings <$> HM.foldlWithKey' f (return []) o
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
877 f accM k v = case T.split (== '/') k of
1155 [port', portType'] -> do
878 [port', portType'] -> do
@@ -1158,15 +881,16 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158 acc <- accM
881 acc <- accM
1159 hps <- parseJSON v
882 hps <- parseJSON v
1160 return $ (PortBinding port portType hps):acc
883 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
885+ fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
1163 parseJSON _ = fail "PortBindings is not an object"
886 parseJSON _ = fail "PortBindings is not an object"
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
888+instance ToJSON PortBindings where
1166− toJSON [] = emptyJsonObject
889+ toJSON (PortBindings []) = JSON.Object HM.empty
1167− toJSON (p:ps) = toJsonKeyVal (p:ps) key val
890+ toJSON (PortBindings (p:ps)) = JSON.Object $ foldl f HM.empty (p:ps)
1168− where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
891+ where mKey p = portAndType2Text (containerPort p) (portType p)
1169− val p = hostPorts p
892+ mVal p = toJSON $ hostPorts p
893+ f acc p = HM.insert (mKey p) (mVal p) acc
1171data HostPort = HostPort {
895data HostPort = HostPort {
1172 hostIp :: Text
896 hostIp :: Text
@@ -1184,6 +908,24 @@ instance FromJSON HostPort where
1184 return $ HostPort i p
908 return $ HostPort i p
1185 parseJSON _ = fail "HostPort is not an object."
909 parseJSON _ = fail "HostPort is not an object."
911+-- newtype HostPorts = HostPorts [HostPort]
912+-- deriving (Eq, Show)
914+-- instance ToJSON HostPorts where
915+-- toJSON (HostPorts hps) = toJSON hps
917+-- instance FromJSON HostPorts where
918+-- parseJSON (JSON.Object o) = do
919+-- HostPorts <$> HM.foldlWithKey' f (return []) o
925+-- p <- parseIntegerText p'
926+-- return $ (HostPort (NetworkInterface k) p):acc
927+-- parseJSON _ = fail $ "HostPorts is not an object"
1187-- { "Name": "on-failure" , "MaximumRetryCount": 2}
929-- { "Name": "on-failure" , "MaximumRetryCount": 2}
1188type RetryCount = Integer
930type RetryCount = Integer
1189data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
931data RestartPolicy = RestartAlways | RestartUnlessStopped | RestartOnFailure RetryCount | RestartOff deriving (Eq, Show)
@@ -1197,7 +939,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
939 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
940 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
941 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
942+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
943 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
944 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +947,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
947 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
948 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
949 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
950+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
952data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1215,11 +957,11 @@ newtype UTSMode = UTSMode Text deriving (Eq, Show)
1215-- TODO: Add UTSMode : UTS namespace to use for the container
957-- 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
958-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
1217data HostConfig = HostConfig
959data HostConfig = HostConfig
1218− { binds :: [Bind]
960+ { binds :: [Volume]
1219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
961 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1220 , logConfig :: LogDriverConfig
962 , logConfig :: LogDriverConfig
1221 , networkMode :: NetworkMode
963 , networkMode :: NetworkMode
1222− , portBindings :: [PortBinding]
964+ , portBindings :: PortBindings
1223 , restartPolicy :: RestartPolicy
965 , restartPolicy :: RestartPolicy
1224 , volumeDriver :: Maybe Text
966 , volumeDriver :: Maybe Text
1225 , volumesFrom :: [VolumeFrom]
967 , volumesFrom :: [VolumeFrom]
@@ -1378,22 +1120,6 @@ instance ToJSON DeviceRate where
1378 , "Rate" .= r
1120 , "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 {
1123data ContainerResources = ContainerResources {
1398 cpuShares :: Maybe Integer
1124 cpuShares :: Maybe Integer
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1125 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1135,12 @@ data ContainerResources = ContainerResources {
1409 , cpusetMems :: Maybe Text
1135 , cpusetMems :: Maybe Text
1410 , devices :: [Device]
1136 , devices :: [Device]
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1137 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1138+ , kernelMemory :: Maybe Integer
1413− , memory :: Maybe MemoryConstraint
1139+ , memory :: Maybe Integer
1414− , memoryReservation :: Maybe MemoryConstraint
1140+ , memoryReservation :: Maybe Integer
1415− , memorySwap :: Maybe MemoryConstraint
1141+ , memorySwap :: Maybe Integer
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1142 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1143+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1144 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1145 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1146 -- TODO: Missing from 1.24
@@ -1452,59 +1178,41 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1178 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1180instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1181+ toJSON (EnvVar n v) = object [n .= v]
1457−-- | ExposedPort represents a port (and it's type)
1183+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1458-- that a container should expose to other containers or the host system.
1184-- that a container should expose to other containers or the host system.
1459−-- `NOTE`: This does not automatically expose the port onto the host
1185+-- `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
1186+-- system but rather it just tags them. It's best to be used with
1461-- the PublishAllPorts flag. It is also useful for
1187-- the PublishAllPorts flag. It is also useful for
1462-- the daemon to know which Environment variables to
1188-- the daemon to know which Environment variables to
1463-- inject into a container linking to our container.
1189-- inject into a container linking to our container.
1464-- Example linking a Postgres container named db would inject the following
1190-- Example linking a Postgres container named db would inject the following
1465-- environment variables automatically if we set the corresponding
1191-- environment variables automatically if we set the corresponding
1466−--
1192+-- ExposedPorts:
1470-- DB_PORT_5432_TCP_PORT="5432"
1193-- DB_PORT_5432_TCP_PORT="5432"
1471-- DB_PORT_5432_TCP_PROTO="tcp"
1194-- DB_PORT_5432_TCP_PROTO="tcp"
1472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1195-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1196+newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1197+-- JP: Should this be ExposedPorts [(Port, PortType)]?
1199+instance FromJSON ExposedPorts where
1200+ parseJSON (JSON.Object o) = do
1201+ 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
1204 f accM k _ = case T.split (== '/') k of
1480 [port', portType'] -> do
1205 [port', portType'] -> do
1481 port <- parseIntegerText port'
1206 port <- parseIntegerText port'
1482 portType <- parseJSON $ JSON.String portType'
1207 portType <- parseJSON $ JSON.String portType'
1483 acc <- accM
1208 acc <- accM
1484− return $ (ExposedPort port portType):acc
1209+ return $ M.insert port portType acc
1485− _ -> fail "Could not parse ExposedPorts"
1211+ fail "Could not parse ExposedPorts"
1486− parseJSON (JSON.Null) = return []
1487− parseJSON _ = fail "ExposedPorts is not an object"
1212+ 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
1214+instance ToJSON ExposedPorts where
1498− toJSON (Entrypoint (e:es)) = toJSON (e:es)
1215+ 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 {
1218data ContainerConfig = ContainerConfig {
@@ -1514,7 +1222,7 @@ data ContainerConfig = ContainerConfig {
1514 , attachStdin :: Bool
1222 , attachStdin :: Bool
1515 , attachStdout :: Bool
1223 , attachStdout :: Bool
1516 , attachStderr :: Bool
1224 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1225+ , 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
1226 -- , publishService :: Text -- Don't see this in 1.24
1519 , tty :: Bool
1227 , tty :: Bool
1520 , openStdin :: Bool
1228 , openStdin :: Bool
@@ -1523,70 +1231,27 @@ data ContainerConfig = ContainerConfig {
1523 , cmd :: [Text]
1231 , cmd :: [Text]
1524 -- , argsEscaped :: Bool -- Don't see this in 1.24
1232 -- , argsEscaped :: Bool -- Don't see this in 1.24
1525 , image :: Text
1233 , image :: Text
1526− , volumes :: [Volume]
1234+ , volumes :: Maybe Volumes
1527 , workingDir :: Maybe FilePath
1235 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1236+ , 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?
1237 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1238 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1239 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1240+ , labels :: Maybe Labels
1533 , stopSignal :: Signal
1241 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1242 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1244instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1245 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1246 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1541instance FromJSON ContainerConfig where
1248instance FromJSON ContainerConfig where
1542− parseJSON (JSON.Object o) = do
1249+ parseJSON = genericParseJSON defaultOptions {
1543− hostname <- o .:? "Hostname"
1250+ 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
1252parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1253parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1254 Nothing ->
1574 fail "Could not parse Integer"
1255 fail "Could not parse Integer"
1575 Just i ->
1256 Just i ->
1576 return i
1257 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