@@ -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,12 +87,11 @@ 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)
@@ -122,23 +101,17 @@ data Endpoint =
122 VersionEndpoint
101 VersionEndpoint
123 | ListContainersEndpoint ListOpts
102 | ListContainersEndpoint ListOpts
124 | ListImagesEndpoint ListOpts
103 | ListImagesEndpoint ListOpts
125− | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
104+ | CreateContainerEndpoint CreateOpts
126 | StartContainerEndpoint StartOpts ContainerID
105 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
106 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
107 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
108 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
109 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
110 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
111 | 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.
112 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
113+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
114 | 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)
115 deriving (Eq, Show)
144-- | We should newtype this
117-- | We should newtype this
@@ -185,20 +158,6 @@ toImageID t =
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
158-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
159data 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
161-- TODO: Add more Signals or use an existing lib
203-- | Signal used for sending to the process running in the container.
162-- | Signal used for sending to the process running in the container.
204-- The default signal is SIGTERM.
163-- The default signal is SIGTERM.
@@ -213,16 +172,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
173instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
174 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
175+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
176+ parseJSON (JSON.String "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
177 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
178 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
179 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
180+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
182instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
183+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
184+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
185 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
186 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
187 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +209,7 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
209 , processLabel :: Text
251 , resolveConfPath :: FilePath
210 , resolveConfPath :: FilePath
252 , restartCount :: Int
211 , restartCount :: Int
253− , containerDetailsState :: ContainerState
212+ , state :: ContainerState
254 , mounts :: [Mount]
213 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
215 deriving (Eq, Show, Generic)
@@ -258,11 +217,11 @@ data ContainerDetails = ContainerDetails {
258-- | Data type used for parsing the mount information from a container
217-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
219data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
220+ mountName :: Text
262 , mountSource :: FilePath
221 , mountSource :: FilePath
263 , mountDestination :: FilePath
222 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
223+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
224+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266 , mountRW :: Bool
225 , mountRW :: Bool
267 , mountPropogation :: Text
226 , mountPropogation :: Text
@@ -270,14 +229,14 @@ data Mount = Mount {
271instance FromJSON Mount where
230instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
231 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
232+ name <- o .: "Name"
274 src <- o .: "Source"
233 src <- o .: "Source"
275 dest <- o .: "Destination"
234 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
235+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
236+ mode <- o .: "Mode"
278 rw <- o .: "RW"
237 rw <- o .: "RW"
279 prop <- o .: "Propagation"
238 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
239+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
240 parseJSON _ = fail "Mount is not an object"
283-- | Data type used for parsing the container state from a list of
242-- | Data type used for parsing the container state from a list of
@@ -293,7 +252,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
252 , restarting :: Bool
294 , running :: Bool
253 , running :: Bool
295 , startedAt :: UTCTime
254 , startedAt :: UTCTime
296− , state :: State
255+ , status :: Status
298 deriving (Eq, Show, Generic)
257 deriving (Eq, Show, Generic)
@@ -456,17 +415,20 @@ instance FromJSON NetworkOptions where
456 parseJSON _ = fail "NetworkOptions is not an object"
415 parseJSON _ = fail "NetworkOptions is not an object"
458-- TODO: Not sure what this is used for anymore.
417-- TODO: Not sure what this is used for anymore.
459−data Network = Network NetworkMode NetworkOptions
418+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
460 deriving (Eq, Show)
419 deriving (Eq, Show)
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
421+instance FromJSON Networks where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
422+ parseJSON (JSON.Object o) = do
423+ Networks <$> HM.foldlWithKey' f (return M.empty) o
465 f accM k' v' = do
426 f accM k' v' = do
466 acc <- accM
427 acc <- accM
467 k <- parseJSON $ JSON.String k'
428 k <- parseJSON $ JSON.String k'
468 v <- parseJSON v'
429 v <- parseJSON v'
469− return $ (Network k v):acc
430+ return $ M.insert k v acc
470 parseJSON _ = fail "Networks is not an object"
432 parseJSON _ = fail "Networks is not an object"
472-- | Data type reprsenting the various network settings a container can have.
434-- | Data type reprsenting the various network settings a container can have.
@@ -476,7 +438,7 @@ data NetworkSettings = NetworkSettings {
476 , networkSettingsHairpinMode :: Bool
438 , networkSettingsHairpinMode :: Bool
477 , networkSettingsLinkLocalIPv6Address :: Text
439 , networkSettingsLinkLocalIPv6Address :: Text
478 , networkSettingsLinkLocalIPv6PrefixLen :: Int
440 , networkSettingsLinkLocalIPv6PrefixLen :: Int
479− , networkSettingsPorts :: [PortBinding]
441+ , networkSettingsPorts :: PortBindings
480 , networkSettingsSandboxKey :: Text
442 , networkSettingsSandboxKey :: Text
481 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
443 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
444 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -488,7 +450,7 @@ data NetworkSettings = NetworkSettings {
488 , networkSettingsIpPrefixLen :: Int
450 , networkSettingsIpPrefixLen :: Int
489 , networkSettingsIpv6Gateway :: Text
451 , networkSettingsIpv6Gateway :: Text
490 , networkSettingsMacAddress :: Text
452 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
453+ , networkSettingsNetworks :: Networks
493 deriving (Eq, Show)
455 deriving (Eq, Show)
@@ -523,23 +485,21 @@ data Container = Container
523 , containerImageId :: ImageID
485 , containerImageId :: ImageID
524 , containerCommand :: Text
486 , containerCommand :: Text
525 , containerCreatedAt :: Int
487 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
488+ , containerStatus :: Status
528 , containerPorts :: [ContainerPortInfo]
489 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
490+ , containerLabels :: Labels
530− , containerNetworks :: [Network]
491+ , containerNetworks :: Networks
531 , containerMounts :: [Mount]
492 , containerMounts :: [Mount]
532 } deriving (Show, Eq)
493 } deriving (Show, Eq)
534instance FromJSON Container where
495instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
496+ parseJSON (JSON.Object v) =
536− Container <$> parseJSON o
497+ Container <$> (v .: "Id")
537 <*> (v .: "Names")
498 <*> (v .: "Names")
538 <*> (v .: "Image")
499 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
500+ <*> (v .: "ImageID")
540− <*> (v .: "Command") -- Doesn't exist anymore
501+ <*> (v .: "Command")
541 <*> (v .: "Created")
502 <*> (v .: "Created")
543 <*> (v .: "Status")
503 <*> (v .: "Status")
544 <*> (v .: "Ports")
504 <*> (v .: "Ports")
545 <*> (v .: "Labels")
505 <*> (v .: "Labels")
@@ -549,45 +509,34 @@ instance FromJSON Container where
549 parseNetworks (JSON.Object v) =
509 parseNetworks (JSON.Object v) =
550 (v .: "Networks") >>= parseJSON
510 (v .: "Networks") >>= parseJSON
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
511 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
513 parseJSON _ = fail "Container: Not a JSON object."
554−-- | Represents the state of the container life cycle.
515+-- | Represents the status of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
516+data Status = Created | Restarting | Running | Paused | Exited | Dead
556 deriving (Eq, Show, Generic)
517 deriving (Eq, Show, Generic)
558−instance FromJSON State where
519+instance FromJSON Status where
559− parseJSON (JSON.String "running") = return Running
520+ parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
521+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561 parseJSON (JSON.String "restarting") = return Restarting
522 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
523+ parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
524+ parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
525+ parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
526+ parseJSON _ = fail "Unknown Status"
567-- | Alias for representing a RepoDigest. We could newtype this and add
528-- | Alias for representing a RepoDigest. We could newtype this and add
568-- some validation.
529-- some validation.
569type Digest = Text
530type Digest = Text
571-- | Container and Image Labels.
532-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
533+newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
535+instance FromJSON Labels where
536+ 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
538+instance ToJSON Labels where
578− toJSON [] = emptyJsonObject
539+ 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.
541-- | Alias for Tags.
593type Tag = Text
542type Tag = Text
@@ -598,10 +547,10 @@ data Image = DockerImage {
598 , imageCreated :: Integer
547 , imageCreated :: Integer
599 , imageParentId :: Maybe ImageID
548 , imageParentId :: Maybe ImageID
600 , imageRepoTags :: [Tag]
549 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
550+ , imageRepoDigests :: Maybe [Digest]
602 , imageSize :: Integer
551 , imageSize :: Integer
603 , imageVirtualSize :: Integer
552 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
553+ , imageLabels :: Maybe Labels
605 } deriving (Show, Eq, Generic)
554 } deriving (Show, Eq, Generic)
607-- | Helper function used for dropping the "image" prefix when serializing
556-- | Helper function used for dropping the "image" prefix when serializing
@@ -609,60 +558,23 @@ data Image = DockerImage {
609dropImagePrefix :: [a] -> [a]
558dropImagePrefix :: [a] -> [a]
610dropImagePrefix = drop 5
559dropImagePrefix = drop 5
613instance FromJSON Image where
561instance FromJSON Image where
614− parseJSON (JSON.Object o) = do
562+ parseJSON = genericParseJSON defaultOptions {
615− imageId <- o .: "Id"
563+ 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.
565-- | Options used for creating a Container.
651data CreateOpts = CreateOpts {
566data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
567+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
568+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
569 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
571instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
572+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
573 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
574 let hcJSON = toJSON hc
661 case ccJSON of
575 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
576 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
577+ 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.
578 _ -> error "ContainerConfig is not an object." -- This should never happen.
668-- | Container configuration used for creating a container with sensible
580-- | Container configuration used for creating a container with sensible
@@ -676,18 +588,18 @@ defaultContainerConfig imageName = ContainerConfig {
676 , attachStdout=False
588 , attachStdout=False
677 , image=imageName
589 , image=imageName
678 , attachStderr=False
590 , attachStderr=False
679− , exposedPorts=[]
591+ , exposedPorts=Nothing -- ExposedPorts M.empty
680 , tty=False
592 , tty=False
681 , openStdin=False
593 , openStdin=False
682 , stdinOnce=False
594 , stdinOnce=False
685− , volumes=[]
597+ , volumes=Nothing
686 , workingDir=Nothing
598 , workingDir=Nothing
687− , entrypoint=Entrypoint []
599+ , entrypoint=Nothing
688 , networkDisabled=Nothing
600 , networkDisabled=Nothing
689 , macAddress=Nothing
601 , macAddress=Nothing
690− , labels=[]
602+ , labels=Nothing
691 , stopSignal=SIGTERM
603 , stopSignal=SIGTERM
@@ -696,9 +608,9 @@ defaultHostConfig :: HostConfig
696defaultHostConfig = HostConfig {
608defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
610 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
611+ , logConfig=LogDriverConfig JsonFile Nothing
700− , networkMode=NetworkBridge
612+ , networkMode=Bridge
701− , portBindings=[]
613+ , portBindings=PortBindings []
702 , restartPolicy=RestartOff
614 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
615 , volumeDriver=Nothing
704 , volumesFrom=[]
616 , volumesFrom=[]
@@ -737,18 +649,14 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
649 , memory=Nothing
738 , memoryReservation=Nothing
650 , memoryReservation=Nothing
739 , memorySwap=Nothing
651 , memorySwap=Nothing
740− , oomKillDisable=Just False
652+ , oomKillDisable=False
741 , ulimits=[]
653 , ulimits=[]
744-- | Default create options when creating a container. You only need to
656-- | Default create options when creating a container. You only need to
745-- specify an image name and the rest is all sensible defaults.
657-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
658defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
659+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.
661-- | 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 _.
662-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +670,16 @@ defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
670defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764-- | Options for deleting a container.
672-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
673+data DeleteOpts = DeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
674 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
675 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
676 } 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
678-- | 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
679-- want to delete the container's volumes or force delete it if it's
794-- running.
680-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
681+defaultDeleteOpts :: DeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
682+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.
684-- | Timestamp alias.
806type Timestamp = Integer
685type Timestamp = Integer
@@ -828,50 +707,18 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
707 , 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")
710-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862-- | Set permissions on volumes that you mount in the container.
711-- | Set permissions on volumes that you mount in the container.
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
712data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
865instance ToJSON VolumePermission where
714instance ToJSON VolumePermission where
866 toJSON ReadWrite = "rw"
715 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
716+ toJSON ReadOnly = "ro"
869instance FromJSON VolumePermission where
718instance FromJSON VolumePermission where
870 parseJSON "rw" = return ReadWrite
719 parseJSON "rw" = return ReadWrite
871 parseJSON "ro" = return ReadOnly
720 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
721+ parseJSON _ = fail "Failed to parse VolumePermission"
876-- | Used for marking a directory in the container as "exposed" hence
723-- | Used for marking a directory in the container as "exposed" hence
877-- taking it outside of the COW filesystem and making it mountable
724-- taking it outside of the COW filesystem and making it mountable
@@ -884,31 +731,29 @@ instance FromJSON VolumePermission where
884-- docker run --name app -v \/opt\/data -it myapp:latest
731-- 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"
732-- docker run --name app2 --volumes-from app \/bin\/bash -c "ls -l \/opt\/data"
887−newtype Volume = Volume FilePath deriving (Eq, Show)
734+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
736+instance FromJSON Volumes where
895− parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
737+ 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"
738+ parseJSON _ = fail "Volumes is not an object"
740+instance ToJSON Volumes where
741+ toJSON (Volumes []) = JSON.Object HM.empty
742+ toJSON (Volumes (v:vs)) = JSON.Object $ foldl f HM.empty (v:vs)
743+ where f acc k = HM.insert (T.pack k) (JSON.Object HM.empty) acc
900−data Bind = Bind { hostSrc :: Text
745+data Volume = Volume { hostSrc :: Text
901− , containerDest :: Text
746+ , containerDest :: Text
902− , volumePermission :: Maybe VolumePermission
747+ , volumePermission :: Maybe VolumePermission
903− } deriving (Eq, Show)
748+ } deriving (Eq, Show)
905−instance FromJSON Bind where
750+instance FromJSON Volume where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
751 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
752+ [src, dest] -> return $ Volume src dest Nothing
908− [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
753+ [src, dest, "rw"] -> return $ Volume src dest $ Just ReadWrite
909− [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
754+ [src, dest, "ro"] -> return $ Volume src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
755+ _ -> fail "Could not parse Volume"
911− parseJSON _ = fail "Bind is not a string"
756+ parseJSON _ = fail "Volume is not a string"
913data Device = Device {
758data Device = Device {
914 pathOnHost :: FilePath
759 pathOnHost :: FilePath
@@ -930,19 +775,19 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
776instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
777 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
778+ [vol] -> return $ VolumeFrom vol Nothing
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
779 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
780 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
781+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
782 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
784instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
785 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
786+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
787 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944−instance ToJSON Bind where
789+instance ToJSON Volume where
945− toJSON (Bind src dest mode) = toJSON $ case mode of
790+ toJSON (Volume src dest mode) = toJSON $ case mode of
946 Nothing -> T.concat[src, ":", dest]
791 Nothing -> T.concat[src, ":", dest]
947 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
792 Just m -> T.concat[src, ":", dest, ":", (T.pack $ show m)]
@@ -950,63 +795,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
796instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
797 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
798+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
799 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
800+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
801 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
803instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
804 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
805 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
806+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
808-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
809data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
811instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
812 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
813+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
814+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
815+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
816+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
817+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
818+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
819+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
820+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
821+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
823instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
824+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
825+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
826+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
827+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
828+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
829+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
830+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
831+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
832 toJSON LoggingDisabled = JSON.String "none"
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
834+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
836+instance FromJSON LogDriverOptions where
992− toJSON [] = emptyJsonObject
837+ parseJSON (JSON.Object o) = do
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
838+ 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
840+ where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
841+ f accM k (JSON.String v) = do
1000 acc <- accM
842 acc <- accM
1001− value <- parseJSON v
1002− return $ (LogDriverOption k value):acc
843+ return $ M.insert k v acc
844+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
1003− parseJSON JSON.Null = return []
846+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
847+ parseJSON _ = fail "LogDriverOptions is not an object"
849+instance ToJSON LogDriverOptions where
850+ toJSON (LogDriverOptions mp) = toJSON mp
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
852+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1008instance ToJSON LogDriverConfig where
854instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
855 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1012instance FromJSON LogDriverConfig where
857instance FromJSON LogDriverConfig where
@@ -1017,41 +862,19 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
862 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
864-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
865+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
866 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
868instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
869+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
870+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
871+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
872+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
874instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
875+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
876+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
877 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)
879data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1067,7 +890,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
890 parseJSON val = case val of
1068 "tcp" -> return TCP
891 "tcp" -> return TCP
1069 "udp" -> return UDP
892 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
893+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
895-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1084,6 +907,13 @@ instance FromJSON PortType where
1084-- interface like `127.0.0.1`.
907-- interface like `127.0.0.1`.
1085-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
908-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
1086-- instance will only send the last one.
909-- instance will only send the last one.
910+newtype PortBindings = PortBindings [PortBinding]
913+instance Monoid PortBindings where
914+ mempty = PortBindings []
915+ mappend (PortBindings p1) (PortBindings p2) = PortBindings (p1 ++ p2)
1087-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
917-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1088data PortBinding = PortBinding {
918data PortBinding = PortBinding {
1089 containerPort :: Port
919 containerPort :: Port
@@ -1094,62 +924,24 @@ data PortBinding = PortBinding {
1094portAndType2Text :: Port -> PortType -> Text
924portAndType2Text :: Port -> PortType -> Text
1095portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
925portAndType2Text 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
927-- | A convenience function that adds PortBindings to and exiting
1133-- "CreateOpts" record. Useful with 'defaultCreateOpts'
928-- "CreateOpts" record. Useful with 'defaultCreateOpts'
1134-- Example:
929-- Example:
1136-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
931-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
1137−-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
932+-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
1138−addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
933+addPortBinding :: CreateOpts -> PortBinding -> CreateOpts
1139−addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
934+addPortBinding c pb = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1140 where hc = hostConfig c
935 where hc = hostConfig c
1141 pbs = portBindings $ hostConfig c
936 pbs = portBindings $ hostConfig c
1143−-- | Helper function for adding a "ExposedPort" to and existing
938+instance ToJSON PortBinding where
1144−-- CreateOpts record.
939+ 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
941+instance FromJSON PortBindings where
942+ parseJSON (JSON.Object o) = do
943+ 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
946 f accM k v = case T.split (== '/') k of
1155 [port', portType'] -> do
947 [port', portType'] -> do
@@ -1158,15 +950,16 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158 acc <- accM
950 acc <- accM
1159 hps <- parseJSON v
951 hps <- parseJSON v
1160 return $ (PortBinding port portType hps):acc
952 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
954+ fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
1163 parseJSON _ = fail "PortBindings is not an object"
955 parseJSON _ = fail "PortBindings is not an object"
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
957+instance ToJSON PortBindings where
1166− toJSON [] = emptyJsonObject
958+ toJSON (PortBindings []) = JSON.Object HM.empty
1167− toJSON (p:ps) = toJsonKeyVal (p:ps) key val
959+ toJSON (PortBindings (p:ps)) = JSON.Object $ foldl f HM.empty (p:ps)
1168− where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
960+ where mKey p = portAndType2Text (containerPort p) (portType p)
1169− val p = hostPorts p
961+ mVal p = toJSON $ hostPorts p
962+ f acc p = HM.insert (mKey p) (mVal p) acc
1171data HostPort = HostPort {
964data HostPort = HostPort {
1172 hostIp :: Text
965 hostIp :: Text
@@ -1197,7 +990,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
990 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
991 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
992 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
993+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
994 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
995 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +998,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
998 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
999 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1000 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1001+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1003data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1215,11 +1008,11 @@ newtype UTSMode = UTSMode Text deriving (Eq, Show)
1215-- TODO: Add UTSMode : UTS namespace to use for the container
1008-- 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
1009-- TODO: Sysctls map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
1217data HostConfig = HostConfig
1010data HostConfig = HostConfig
1218− { binds :: [Bind]
1011+ { binds :: [Volume]
1219 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1012 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
1220 , logConfig :: LogDriverConfig
1013 , logConfig :: LogDriverConfig
1221 , networkMode :: NetworkMode
1014 , networkMode :: NetworkMode
1222− , portBindings :: [PortBinding]
1015+ , portBindings :: PortBindings
1223 , restartPolicy :: RestartPolicy
1016 , restartPolicy :: RestartPolicy
1224 , volumeDriver :: Maybe Text
1017 , volumeDriver :: Maybe Text
1225 , volumesFrom :: [VolumeFrom]
1018 , volumesFrom :: [VolumeFrom]
@@ -1378,22 +1171,6 @@ instance ToJSON DeviceRate where
1378 , "Rate" .= r
1171 , "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 {
1174data ContainerResources = ContainerResources {
1398 cpuShares :: Maybe Integer
1175 cpuShares :: Maybe Integer
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1176 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1186,12 @@ data ContainerResources = ContainerResources {
1409 , cpusetMems :: Maybe Text
1186 , cpusetMems :: Maybe Text
1410 , devices :: [Device]
1187 , devices :: [Device]
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1188 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1189+ , kernelMemory :: Maybe Integer
1413− , memory :: Maybe MemoryConstraint
1190+ , memory :: Maybe Integer
1414− , memoryReservation :: Maybe MemoryConstraint
1191+ , memoryReservation :: Maybe Integer
1415− , memorySwap :: Maybe MemoryConstraint
1192+ , memorySwap :: Maybe Integer
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1193 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1194+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1195 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1196 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1197 -- TODO: Missing from 1.24
@@ -1452,59 +1229,45 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1229 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1231instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1232+ toJSON (EnvVar n v) = object [n .= v]
1457−-- | ExposedPort represents a port (and it's type)
1234+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
1458-- that a container should expose to other containers or the host system.
1235-- that a container should expose to other containers or the host system.
1459−-- `NOTE`: This does not automatically expose the port onto the host
1236+-- `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
1237+-- system but rather it just tags them. It's best to be used with
1461-- the PublishAllPorts flag. It is also useful for
1238-- the PublishAllPorts flag. It is also useful for
1462-- the daemon to know which Environment variables to
1239-- the daemon to know which Environment variables to
1463-- inject into a container linking to our container.
1240-- inject into a container linking to our container.
1464-- Example linking a Postgres container named db would inject the following
1241-- Example linking a Postgres container named db would inject the following
1465-- environment variables automatically if we set the corresponding
1242-- environment variables automatically if we set the corresponding
1467−-- ExposedPort:
1244+-- ExposedPorts:
1470-- DB_PORT_5432_TCP_PORT="5432"
1247-- DB_PORT_5432_TCP_PORT="5432"
1471-- DB_PORT_5432_TCP_PROTO="tcp"
1248-- DB_PORT_5432_TCP_PROTO="tcp"
1472-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1249-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1251+newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1252+-- JP: Should this be ExposedPorts [(Port, PortType)]?
1254+instance FromJSON ExposedPorts where
1255+ parseJSON (JSON.Object o) = do
1256+ 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
1259 f accM k _ = case T.split (== '/') k of
1480 [port', portType'] -> do
1260 [port', portType'] -> do
1481 port <- parseIntegerText port'
1261 port <- parseIntegerText port'
1482 portType <- parseJSON $ JSON.String portType'
1262 portType <- parseJSON $ JSON.String portType'
1483 acc <- accM
1263 acc <- accM
1484− return $ (ExposedPort port portType):acc
1264+ return $ M.insert port portType acc
1485− _ -> fail "Could not parse ExposedPorts"
1266+ fail "Could not parse ExposedPorts"
1486− parseJSON (JSON.Null) = return []
1487− parseJSON _ = fail "ExposedPorts is not an object"
1267+ 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
1269+instance ToJSON ExposedPorts where
1502− parseJSON (JSON.String e) = return $ Entrypoint [e]
1270+ 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 {
1273data ContainerConfig = ContainerConfig {
@@ -1514,7 +1277,7 @@ data ContainerConfig = ContainerConfig {
1514 , attachStdin :: Bool
1277 , attachStdin :: Bool
1515 , attachStdout :: Bool
1278 , attachStdout :: Bool
1516 , attachStderr :: Bool
1279 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1280+ , 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
1281 -- , publishService :: Text -- Don't see this in 1.24
1519 , tty :: Bool
1282 , tty :: Bool
1520 , openStdin :: Bool
1283 , openStdin :: Bool
@@ -1523,70 +1286,27 @@ data ContainerConfig = ContainerConfig {
1523 , cmd :: [Text]
1286 , cmd :: [Text]
1524 -- , argsEscaped :: Bool -- Don't see this in 1.24
1287 -- , argsEscaped :: Bool -- Don't see this in 1.24
1525 , image :: Text
1288 , image :: Text
1526− , volumes :: [Volume]
1289+ , volumes :: Maybe Volumes
1527 , workingDir :: Maybe FilePath
1290 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1291+ , 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?
1292 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1293 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1294 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1295+ , labels :: Maybe Labels
1533 , stopSignal :: Signal
1296 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1297 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1299instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1300 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1301 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1541instance FromJSON ContainerConfig where
1303instance FromJSON ContainerConfig where
1542− parseJSON (JSON.Object o) = do
1304+ parseJSON = genericParseJSON defaultOptions {
1543− hostname <- o .:? "Hostname"
1305+ 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
1307parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1308parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1309 Nothing ->
1574 fail "Could not parse Integer"
1310 fail "Could not parse Integer"
1575 Just i ->
1311 Just i ->
1576 return i
1312 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