@@ -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,30 +22,23 @@ 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(..)
54 , Bind(..)
43 , Bind(..)
55 , Volume(..)
44 , Volume(..)
@@ -58,16 +47,17 @@ module Docker.Client.Types (
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,15 @@ 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
97 , addVolume
84 , addVolume
98 , addVolumeFrom
85 , addVolumeFrom
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
88import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,12 +92,11 @@ import qualified Data.Aeson as JSON
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
92import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
108import Data.Char (isAlphaNum, toUpper)
93import Data.Char (isAlphaNum, toUpper)
109import qualified Data.HashMap.Strict as HM
94import qualified Data.HashMap.Strict as HM
95+import qualified Data.Map as M
110import Data.Monoid ((<>))
96import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
112import Data.Text (Text)
97import Data.Text (Text)
113import qualified Data.Text as T
98import qualified Data.Text as T
114import Data.Time.Clock (UTCTime)
99import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116import GHC.Generics (Generic)
100import GHC.Generics (Generic)
117import Prelude hiding (all, tail)
101import Prelude hiding (all, tail)
118import Text.Read (readMaybe)
102import Text.Read (readMaybe)
@@ -125,20 +109,14 @@ data Endpoint =
125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
109 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126 | StartContainerEndpoint StartOpts ContainerID
110 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
111 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
112 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
113 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
114 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
115 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
116 | 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.
117 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
118+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
119 | 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)
120 deriving (Eq, Show)
144-- | We should newtype this
122-- | We should newtype this
@@ -185,20 +163,6 @@ toImageID t =
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
163-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
164data 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
166-- TODO: Add more Signals or use an existing lib
203-- | Signal used for sending to the process running in the container.
167-- | Signal used for sending to the process running in the container.
204-- The default signal is SIGTERM.
168-- The default signal is SIGTERM.
@@ -213,16 +177,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
178instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
179 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
180+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
181+ parseJSON (JSON.String "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
182 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
183 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
184 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
185+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
187instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
188+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
189+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
190 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
191 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
192 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +214,7 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
214 , processLabel :: Text
251 , resolveConfPath :: FilePath
215 , resolveConfPath :: FilePath
252 , restartCount :: Int
216 , restartCount :: Int
253− , containerDetailsState :: ContainerState
217+ , state :: ContainerState
254 , mounts :: [Mount]
218 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
220 deriving (Eq, Show, Generic)
@@ -258,11 +222,11 @@ data ContainerDetails = ContainerDetails {
258-- | Data type used for parsing the mount information from a container
222-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
224data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
225+ mountName :: Text
262 , mountSource :: FilePath
226 , mountSource :: FilePath
263 , mountDestination :: FilePath
227 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
228+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
229+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266 , mountRW :: Bool
230 , mountRW :: Bool
267 , mountPropogation :: Text
231 , mountPropogation :: Text
@@ -270,14 +234,14 @@ data Mount = Mount {
271instance FromJSON Mount where
235instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
236 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
237+ name <- o .: "Name"
274 src <- o .: "Source"
238 src <- o .: "Source"
275 dest <- o .: "Destination"
239 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
240+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
241+ mode <- o .: "Mode"
278 rw <- o .: "RW"
242 rw <- o .: "RW"
279 prop <- o .: "Propagation"
243 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
244+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
245 parseJSON _ = fail "Mount is not an object"
283-- | Data type used for parsing the container state from a list of
247-- | Data type used for parsing the container state from a list of
@@ -293,7 +257,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
257 , restarting :: Bool
294 , running :: Bool
258 , running :: Bool
295 , startedAt :: UTCTime
259 , startedAt :: UTCTime
296− , state :: State
260+ , status :: Status
298 deriving (Eq, Show, Generic)
262 deriving (Eq, Show, Generic)
@@ -456,17 +420,20 @@ instance FromJSON NetworkOptions where
456 parseJSON _ = fail "NetworkOptions is not an object"
420 parseJSON _ = fail "NetworkOptions is not an object"
458-- TODO: Not sure what this is used for anymore.
422-- TODO: Not sure what this is used for anymore.
459−data Network = Network NetworkMode NetworkOptions
423+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
460 deriving (Eq, Show)
424 deriving (Eq, Show)
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
426+instance FromJSON Networks where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
427+ parseJSON (JSON.Object o) = do
428+ Networks <$> HM.foldlWithKey' f (return M.empty) o
465 f accM k' v' = do
431 f accM k' v' = do
466 acc <- accM
432 acc <- accM
467 k <- parseJSON $ JSON.String k'
433 k <- parseJSON $ JSON.String k'
468 v <- parseJSON v'
434 v <- parseJSON v'
469− return $ (Network k v):acc
435+ return $ M.insert k v acc
470 parseJSON _ = fail "Networks is not an object"
437 parseJSON _ = fail "Networks is not an object"
472-- | Data type reprsenting the various network settings a container can have.
439-- | Data type reprsenting the various network settings a container can have.
@@ -476,7 +443,7 @@ data NetworkSettings = NetworkSettings {
476 , networkSettingsHairpinMode :: Bool
443 , networkSettingsHairpinMode :: Bool
477 , networkSettingsLinkLocalIPv6Address :: Text
444 , networkSettingsLinkLocalIPv6Address :: Text
478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
445 , networkSettingsLinkLocalIPv6PrefixLen :: Int
479− , networkSettingsPorts :: [PortBinding]
446+ , networkSettingsPorts :: PortBindings
480 , networkSettingsSandboxKey :: Text
447 , networkSettingsSandboxKey :: Text
481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
448 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
449 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -488,7 +455,7 @@ data NetworkSettings = NetworkSettings {
488 , networkSettingsIpPrefixLen :: Int
455 , networkSettingsIpPrefixLen :: Int
489 , networkSettingsIpv6Gateway :: Text
456 , networkSettingsIpv6Gateway :: Text
490 , networkSettingsMacAddress :: Text
457 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
458+ , networkSettingsNetworks :: Networks
493 deriving (Eq, Show)
460 deriving (Eq, Show)
@@ -523,23 +490,21 @@ data Container = Container
523 , containerImageId :: ImageID
490 , containerImageId :: ImageID
524 , containerCommand :: Text
491 , containerCommand :: Text
525 , containerCreatedAt :: Int
492 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
493+ , containerStatus :: Status
528 , containerPorts :: [ContainerPortInfo]
494 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
495+ , containerLabels :: Labels
530− , containerNetworks :: [Network]
496+ , containerNetworks :: Networks
531 , containerMounts :: [Mount]
497 , containerMounts :: [Mount]
532 } deriving (Show, Eq)
498 } deriving (Show, Eq)
534instance FromJSON Container where
500instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
501+ parseJSON (JSON.Object v) =
536− Container <$> parseJSON o
502+ Container <$> (v .: "Id")
537 <*> (v .: "Names")
503 <*> (v .: "Names")
538 <*> (v .: "Image")
504 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
505+ <*> (v .: "ImageID")
540− <*> (v .: "Command") -- Doesn't exist anymore
506+ <*> (v .: "Command")
541 <*> (v .: "Created")
507 <*> (v .: "Created")
543 <*> (v .: "Status")
508 <*> (v .: "Status")
544 <*> (v .: "Ports")
509 <*> (v .: "Ports")
545 <*> (v .: "Labels")
510 <*> (v .: "Labels")
@@ -549,45 +514,34 @@ instance FromJSON Container where
549 parseNetworks (JSON.Object v) =
514 parseNetworks (JSON.Object v) =
550 (v .: "Networks") >>= parseJSON
515 (v .: "Networks") >>= parseJSON
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
516 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
518 parseJSON _ = fail "Container: Not a JSON object."
554−-- | Represents the state of the container life cycle.
520+-- | Represents the status of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
521+data Status = Created | Restarting | Running | Paused | Exited | Dead
556 deriving (Eq, Show, Generic)
522 deriving (Eq, Show, Generic)
558−instance FromJSON State where
524+instance FromJSON Status where
559− parseJSON (JSON.String "running") = return Running
525+ parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
526+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561 parseJSON (JSON.String "restarting") = return Restarting
527 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
528+ parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
529+ parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
530+ parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
531+ parseJSON _ = fail "Unknown Status"
567-- | Alias for representing a RepoDigest. We could newtype this and add
533-- | Alias for representing a RepoDigest. We could newtype this and add
568-- some validation.
534-- some validation.
569type Digest = Text
535type Digest = Text
571-- | Container and Image Labels.
537-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
538+newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
540+instance FromJSON Labels where
541+ parseJSON val = Labels <$> parseJSON val
575−-- If there are multiple lables with the same Name in the list
576−-- then the last one wins.
577−instance {-# OVERLAPPING #-} ToJSON [Label] where
543+instance ToJSON Labels where
578− toJSON [] = emptyJsonObject
544+ toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
579− toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580− where key (Label k _) = T.unpack k
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
584− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
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."
592-- | Alias for Tags.
546-- | Alias for Tags.
593type Tag = Text
547type Tag = Text
@@ -598,10 +552,10 @@ data Image = DockerImage {
598 , imageCreated :: Integer
552 , imageCreated :: Integer
599 , imageParentId :: Maybe ImageID
553 , imageParentId :: Maybe ImageID
600 , imageRepoTags :: [Tag]
554 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
555+ , imageRepoDigests :: Maybe [Digest]
602 , imageSize :: Integer
556 , imageSize :: Integer
603 , imageVirtualSize :: Integer
557 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
558+ , imageLabels :: Maybe Labels
605 } deriving (Show, Eq, Generic)
559 } deriving (Show, Eq, Generic)
607-- | Helper function used for dropping the "image" prefix when serializing
561-- | Helper function used for dropping the "image" prefix when serializing
@@ -609,60 +563,23 @@ data Image = DockerImage {
609dropImagePrefix :: [a] -> [a]
563dropImagePrefix :: [a] -> [a]
610dropImagePrefix = drop 5
564dropImagePrefix = drop 5
613instance FromJSON Image where
566instance FromJSON Image where
614− parseJSON (JSON.Object o) = do
567+ parseJSON = genericParseJSON defaultOptions {
615− imageId <- o .: "Id"
568+ fieldLabelModifier = dropImagePrefix}
616− imageCreated <- o .: "Created"
617− imageParentId <- o .:? "ParentId"
618− imageRepoTags <- o .:? "RepoTags" .!= []
619− imageRepoDigests <- o .:? "RepoDigests" .!= []
620− imageSize <- o .: "Size"
621− imageVirtualSize <- o .: "VirtualSize"
622− imageLabels <- o .:? "Labels" .!= []
623− return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624− parseJSON _ = fail "Failed to parse DockerImage."
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.
570-- | Options used for creating a Container.
651data CreateOpts = CreateOpts {
571data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
572+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
573+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
574 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
576instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
577+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
578 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
579 let hcJSON = toJSON hc
661 case ccJSON of
580 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
581 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
582+ 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.
583 _ -> error "ContainerConfig is not an object." -- This should never happen.
668-- | Container configuration used for creating a container with sensible
585-- | Container configuration used for creating a container with sensible
@@ -676,7 +593,7 @@ defaultContainerConfig imageName = ContainerConfig {
676 , attachStdout=False
593 , attachStdout=False
677 , image=imageName
594 , image=imageName
678 , attachStderr=False
595 , attachStderr=False
679− , exposedPorts=[]
596+ , exposedPorts=Nothing -- ExposedPorts M.empty
680 , tty=False
597 , tty=False
681 , openStdin=False
598 , openStdin=False
682 , stdinOnce=False
599 , stdinOnce=False
@@ -684,10 +601,10 @@ defaultContainerConfig imageName = ContainerConfig {
685 , volumes=[]
602 , volumes=[]
686 , workingDir=Nothing
603 , workingDir=Nothing
687− , entrypoint=Entrypoint []
604+ , entrypoint=Nothing
688 , networkDisabled=Nothing
605 , networkDisabled=Nothing
689 , macAddress=Nothing
606 , macAddress=Nothing
690− , labels=[]
607+ , labels=Nothing
691 , stopSignal=SIGTERM
608 , stopSignal=SIGTERM
@@ -696,9 +613,9 @@ defaultHostConfig :: HostConfig
696defaultHostConfig = HostConfig {
613defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
615 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
616+ , logConfig=LogDriverConfig JsonFile Nothing
700− , networkMode=NetworkBridge
617+ , networkMode=Bridge
701− , portBindings=[]
618+ , portBindings=PortBindings []
702 , restartPolicy=RestartOff
619 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
620 , volumeDriver=Nothing
704 , volumesFrom=[]
621 , volumesFrom=[]
@@ -737,18 +654,14 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
654 , memory=Nothing
738 , memoryReservation=Nothing
655 , memoryReservation=Nothing
739 , memorySwap=Nothing
656 , memorySwap=Nothing
740− , oomKillDisable=Just False
657+ , oomKillDisable=False
741 , ulimits=[]
658 , ulimits=[]
744-- | Default create options when creating a container. You only need to
661-- | Default create options when creating a container. You only need to
745-- specify an image name and the rest is all sensible defaults.
662-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
663defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
664+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.
666-- | 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 _.
667-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +675,16 @@ defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
675defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764-- | Options for deleting a container.
677-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
678+data DeleteOpts = DeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
679 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
680 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
681 } deriving (Eq, Show)
770−-- TODO: Add support for container build constraints
771−-- | Options for when building images from a Dockerfile
772−data BuildOpts = BuildOpts {
773− buildImageName :: Text -- ^ Image name in the form of name:tag; ie. myimage:latest.:w
774− , buildDockerfileName :: Text -- ^ Name of dockerfile (default: Dockerfile)
775− , buildQuiet :: Bool
776− , buildNoCache :: Bool -- ^ Do not use cache when building the image.
777− , buildRemoveItermediate :: Bool -- ^ Remove intermediate containers after a successful build (default true).
778− , buildForceRemoveIntermediate :: Bool -- ^ Always remove intermediate containers.
779− , buildPullParent :: Bool -- ^ Always attempt to pull a newer version of the *parent* image (ie. FROM debian:jessie).
780− } deriving (Eq, Show)
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
683-- | 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
684-- want to delete the container's volumes or force delete it if it's
794-- running.
685-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
686+defaultDeleteOpts :: DeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
687+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.
689-- | Timestamp alias.
806type Timestamp = Integer
690type Timestamp = Integer
@@ -828,50 +712,18 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
712 , 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")
715-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862-- | Set permissions on volumes that you mount in the container.
716-- | Set permissions on volumes that you mount in the container.
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
717data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
865instance ToJSON VolumePermission where
719instance ToJSON VolumePermission where
866 toJSON ReadWrite = "rw"
720 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
721+ toJSON ReadOnly = "ro"
869instance FromJSON VolumePermission where
723instance FromJSON VolumePermission where
870 parseJSON "rw" = return ReadWrite
724 parseJSON "rw" = return ReadWrite
871 parseJSON "ro" = return ReadOnly
725 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
726+ parseJSON _ = fail "Failed to parse VolumePermission"
876-- | Used for marking a directory in the container as "exposed" hence
728-- | Used for marking a directory in the container as "exposed" hence
877-- taking it outside of the COW filesystem and making it mountable
729-- taking it outside of the COW filesystem and making it mountable
@@ -886,15 +738,22 @@ instance FromJSON VolumePermission where
887newtype Volume = Volume FilePath deriving (Eq, Show)
739newtype Volume = Volume FilePath deriving (Eq, Show)
741+instance ToJSON Volume where
742+ toJSON (Volume fp) = JSON.Object $ HM.insert (T.pack fp) (JSON.Object HM.empty) HM.empty
744+instance FromJSON Volume where
745+ parseJSON (JSON.Object o) = return $ Volume $ T.unpack $ head $ HM.keys o
746+ parseJSON _ = fail "Volume is not an object"
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
748+instance ToJSON [Volume] where
890− toJSON [] = emptyJsonObject
749+ toJSON [] = JSON.Object HM.empty
891− toJSON (v:vs) = toJsonKey (v:vs) getKey
750+ toJSON (v:vs) = JSON.Object $ foldl f HM.empty (v:vs)
892− where getKey (Volume v) = v
751+ where f acc (Volume k) = HM.insert (T.pack k) (JSON.Object HM.empty) acc
894−instance {-# OVERLAPPING #-} FromJSON [Volume] where
753+instance FromJSON [Volume] where
895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
754 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
755+ parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
756+ parseJSON _ = fail "Volume is not an object"
900data Bind = Bind { hostSrc :: Text
759data Bind = Bind { hostSrc :: Text
@@ -904,10 +763,10 @@ data Bind = Bind { hostSrc :: Text
905instance FromJSON Bind where
764instance FromJSON Bind where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
765 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
766+ [src, dest] -> return $ Bind src dest Nothing
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
767 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
768 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
769+ _ -> fail "Could not parse Bind"
911 parseJSON _ = fail "Bind is not a string"
770 parseJSON _ = fail "Bind is not a string"
913data Device = Device {
772data Device = Device {
@@ -930,15 +789,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
790instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
791 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
792+ [vol] -> return $ VolumeFrom vol Nothing
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
793 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
794 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
795+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
796 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
798instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
799 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
800+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
801 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944instance ToJSON Bind where
803instance ToJSON Bind where
@@ -950,63 +809,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
810instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
811 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
812+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
813 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
814+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
815 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
817instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
818 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
819 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
820+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
822-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
823data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
825instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
826 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
827+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
828+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
829+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
830+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
831+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
832+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
833+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
834+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
835+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
837instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
838+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
839+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
840+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
841+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
842+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
843+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
844+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
845+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
846 toJSON LoggingDisabled = JSON.String "none"
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
848+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
850+instance FromJSON LogDriverOptions where
992− toJSON [] = emptyJsonObject
851+ parseJSON (JSON.Object o) = do
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
852+ 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
854+ where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
855+ f accM k (JSON.String v) = do
1000 acc <- accM
856 acc <- accM
1001− value <- parseJSON v
857+ return $ M.insert k v acc
1002− return $ (LogDriverOption k value):acc
858+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
1003− parseJSON JSON.Null = return []
860+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
861+ parseJSON _ = fail "LogDriverOptions is not an object"
863+instance ToJSON LogDriverOptions where
864+ toJSON (LogDriverOptions mp) = toJSON mp
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
866+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1008instance ToJSON LogDriverConfig where
868instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
869 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1012instance FromJSON LogDriverConfig where
871instance FromJSON LogDriverConfig where
@@ -1017,41 +876,19 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
876 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
878-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
879+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
880 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
882instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
883+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
884+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
885+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
886+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
888instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
889+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
890+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
891 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)
893data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1067,7 +904,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
904 parseJSON val = case val of
1068 "tcp" -> return TCP
905 "tcp" -> return TCP
1069 "udp" -> return UDP
906 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
907+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
909-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1084,6 +921,13 @@ instance FromJSON PortType where
1084-- interface like `127.0.0.1`.
921-- interface like `127.0.0.1`.
1085-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
922-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
1086-- instance will only send the last one.
923-- instance will only send the last one.
924+newtype PortBindings = PortBindings [PortBinding]
927+instance Monoid PortBindings where
928+ mempty = PortBindings []
929+ mappend (PortBindings p1) (PortBindings p2) = PortBindings (p1 ++ p2)
1087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
931-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1088data PortBinding = PortBinding {
932data PortBinding = PortBinding {
1089 containerPort :: Port
933 containerPort :: Port
@@ -1134,22 +978,19 @@ addVolumeFrom vf c = c{hostConfig=hc{volumesFrom=oldvfs <> [vf]}}
1134-- Example:
978-- Example:
1136-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
980-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
1137−-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
981+-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
1138addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
982addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
1139−addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
983+addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1140 where hc = hostConfig c
984 where hc = hostConfig c
1141 pbs = portBindings $ hostConfig c
985 pbs = portBindings $ hostConfig c
1143−-- | Helper function for adding a "ExposedPort" to and existing
987+instance ToJSON PortBinding where
1144−-- CreateOpts record.
988+ 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
990+instance FromJSON PortBindings where
991+ parseJSON (JSON.Object o) = do
992+ 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
995 f accM k v = case T.split (== '/') k of
1155 [port', portType'] -> do
996 [port', portType'] -> do
@@ -1158,15 +999,16 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158 acc <- accM
999 acc <- accM
1159 hps <- parseJSON v
1000 hps <- parseJSON v
1160 return $ (PortBinding port portType hps):acc
1001 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
1003+ fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
1163 parseJSON _ = fail "PortBindings is not an object"
1004 parseJSON _ = fail "PortBindings is not an object"
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1006+instance ToJSON PortBindings where
1166− toJSON [] = emptyJsonObject
1007+ toJSON (PortBindings []) = JSON.Object HM.empty
1167− toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1008+ toJSON (PortBindings (p:ps)) = JSON.Object $ foldl f HM.empty (p:ps)
1168− where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1009+ where mKey p = portAndType2Text (containerPort p) (portType p)
1169− val p = hostPorts p
1010+ mVal p = toJSON $ hostPorts p
1011+ f acc p = HM.insert (mKey p) (mVal p) acc
1171data HostPort = HostPort {
1013data HostPort = HostPort {
1172 hostIp :: Text
1014 hostIp :: Text
@@ -1197,7 +1039,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
1039 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
1040 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
1041 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1042+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
1043 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
1044 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +1047,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1047 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1048 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1049 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1050+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1052data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1219,7 +1061,7 @@ data HostConfig = HostConfig
1219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1061 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1220 , logConfig :: LogDriverConfig
1062 , logConfig :: LogDriverConfig
1221 , networkMode :: NetworkMode
1063 , networkMode :: NetworkMode
1222− , portBindings :: [PortBinding]
1064+ , portBindings :: PortBindings
1223 , restartPolicy :: RestartPolicy
1065 , restartPolicy :: RestartPolicy
1224 , volumeDriver :: Maybe Text
1066 , volumeDriver :: Maybe Text
1225 , volumesFrom :: [VolumeFrom]
1067 , volumesFrom :: [VolumeFrom]
@@ -1378,22 +1220,6 @@ instance ToJSON DeviceRate where
1378 , "Rate" .= r
1220 , "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 {
1223data ContainerResources = ContainerResources {
1398 cpuShares :: Maybe Integer
1224 cpuShares :: Maybe Integer
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1225 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1235,12 @@ data ContainerResources = ContainerResources {
1409 , cpusetMems :: Maybe Text
1235 , cpusetMems :: Maybe Text
1410 , devices :: [Device]
1236 , devices :: [Device]
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1237 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1238+ , kernelMemory :: Maybe Integer
1413− , memory :: Maybe MemoryConstraint
1239+ , memory :: Maybe Integer
1414− , memoryReservation :: Maybe MemoryConstraint
1240+ , memoryReservation :: Maybe Integer
1415− , memorySwap :: Maybe MemoryConstraint
1241+ , memorySwap :: Maybe Integer
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1242 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1243+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1244 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1245 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1246 -- TODO: Missing from 1.24
@@ -1452,59 +1278,45 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1278 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1280instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1281+ toJSON (EnvVar n v) = object [n .= v]
1457−-- | ExposedPort represents a port (and it's type)
1283+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1458-- that a container should expose to other containers or the host system.
1284-- that a container should expose to other containers or the host system.
1459−-- `NOTE`: This does not automatically expose the port onto the host
1285+-- `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
1286+-- system but rather it just tags them. It's best to be used with
1461-- the PublishAllPorts flag. It is also useful for
1287-- the PublishAllPorts flag. It is also useful for
1462-- the daemon to know which Environment variables to
1288-- the daemon to know which Environment variables to
1463-- inject into a container linking to our container.
1289-- inject into a container linking to our container.
1464-- Example linking a Postgres container named db would inject the following
1290-- Example linking a Postgres container named db would inject the following
1465-- environment variables automatically if we set the corresponding
1291-- environment variables automatically if we set the corresponding
1467−-- ExposedPort:
1293+-- ExposedPorts:
1470-- DB_PORT_5432_TCP_PORT="5432"
1296-- DB_PORT_5432_TCP_PORT="5432"
1471-- DB_PORT_5432_TCP_PROTO="tcp"
1297-- DB_PORT_5432_TCP_PROTO="tcp"
1472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1298-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1300+newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1301+-- JP: Should this be ExposedPorts [(Port, PortType)]?
1303+instance FromJSON ExposedPorts where
1304+ parseJSON (JSON.Object o) = do
1305+ 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
1308 f accM k _ = case T.split (== '/') k of
1480 [port', portType'] -> do
1309 [port', portType'] -> do
1481 port <- parseIntegerText port'
1310 port <- parseIntegerText port'
1482 portType <- parseJSON $ JSON.String portType'
1311 portType <- parseJSON $ JSON.String portType'
1483 acc <- accM
1312 acc <- accM
1484− return $ (ExposedPort port portType):acc
1313+ return $ M.insert port portType acc
1485− _ -> fail "Could not parse ExposedPorts"
1315+ fail "Could not parse ExposedPorts"
1486− parseJSON (JSON.Null) = return []
1487− parseJSON _ = fail "ExposedPorts is not an object"
1316+ 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
1498− toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499− toJSON (Entrypoint []) = JSON.Null
1501−instance FromJSON Entrypoint where
1318+instance ToJSON ExposedPorts where
1502− parseJSON (JSON.String e) = return $ Entrypoint [e]
1319+ toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
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 {
1322data ContainerConfig = ContainerConfig {
@@ -1514,7 +1326,7 @@ data ContainerConfig = ContainerConfig {
1514 , attachStdin :: Bool
1326 , attachStdin :: Bool
1515 , attachStdout :: Bool
1327 , attachStdout :: Bool
1516 , attachStderr :: Bool
1328 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1329+ , 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
1330 -- , publishService :: Text -- Don't see this in 1.24
1519 , tty :: Bool
1331 , tty :: Bool
1520 , openStdin :: Bool
1332 , openStdin :: Bool
@@ -1525,68 +1337,25 @@ data ContainerConfig = ContainerConfig {
1525 , image :: Text
1337 , image :: Text
1526 , volumes :: [Volume]
1338 , volumes :: [Volume]
1527 , workingDir :: Maybe FilePath
1339 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1340+ , 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?
1341 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1342 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1343 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1344+ , labels :: Maybe Labels
1533 , stopSignal :: Signal
1345 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1346 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1348instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1349 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1350 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1541instance FromJSON ContainerConfig where
1352instance FromJSON ContainerConfig where
1542− parseJSON (JSON.Object o) = do
1353+ parseJSON = genericParseJSON defaultOptions {
1543− hostname <- o .:? "Hostname"
1354+ 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
1356parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1357parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1358 Nothing ->
1574 fail "Could not parse Integer"
1359 fail "Could not parse Integer"
1575 Just i ->
1360 Just i ->
1576 return i
1361 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