@@ -11,7 +11,11 @@ module Docker.Client.Types (
12 , fromImageID
12 , fromImageID
13 , toImageID
13 , toImageID
14 , Timeout(..)
17 , Timeout(..)
15 , Signal(..)
19 , Signal(..)
16 , ContainerDetails(..)
20 , ContainerDetails(..)
17 , DockerClientOpts(..)
21 , DockerClientOpts(..)
@@ -22,23 +26,30 @@ module Docker.Client.Types (
22 , ContainerPortInfo(..)
26 , ContainerPortInfo(..)
23 , Container(..)
27 , Container(..)
24 , ContainerState(..)
28 , ContainerState(..)
25− , Status(..)
29+ , State(..)
27 , Label(..)
31 , Label(..)
29 , Image(..)
33 , Image(..)
30 , dropImagePrefix
35 , dropImagePrefix
31 , CreateOpts(..)
36 , CreateOpts(..)
32 , defaultCreateOpts
39 , defaultCreateOpts
33 , DetachKeys(..)
40 , DetachKeys(..)
34 , StartOpts(..)
41 , StartOpts(..)
35 , defaultStartOpts
42 , defaultStartOpts
36− , DeleteOpts(..)
43+ , ContainerDeleteOpts(..)
37− , defaultDeleteOpts
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
38 , Timestamp
47 , Timestamp
39 , TailLogOpt(..)
48 , TailLogOpt(..)
40 , LogOpts(..)
49 , LogOpts(..)
41 , defaultLogOpts
50 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
42 , VolumePermission(..)
53 , VolumePermission(..)
43 , Bind(..)
54 , Bind(..)
44 , Volume(..)
55 , Volume(..)
@@ -52,7 +63,7 @@ module Docker.Client.Types (
52 , NetworkMode(..)
63 , NetworkMode(..)
53 , PortType(..)
64 , PortType(..)
54-- , NetworkInterface(..)
65-- , NetworkInterface(..)
55− , Networks(..)
66+ , Network(..)
56 , NetworkSettings(..)
67 , NetworkSettings(..)
57 , NetworkOptions(..)
68 , NetworkOptions(..)
58 , Mount(..)
69 , Mount(..)
@@ -64,6 +75,8 @@ module Docker.Client.Types (
64 , UTSMode(..)
75 , UTSMode(..)
65 , HostConfig(..)
76 , HostConfig(..)
66 , defaultHostConfig
77 , defaultHostConfig
78+ , NetworkingConfig(..)
67 , Ulimit(..)
80 , Ulimit(..)
68 , ContainerResources(..)
81 , ContainerResources(..)
69 , defaultContainerResources
82 , defaultContainerResources
@@ -83,6 +96,8 @@ module Docker.Client.Types (
84 , addVolume
97 , addVolume
85 , addVolumeFrom
98 , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
88import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -92,11 +107,12 @@ import qualified Data.Aeson as JSON
92import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
93import Data.Char (isAlphaNum, toUpper)
108import Data.Char (isAlphaNum, toUpper)
94import qualified Data.HashMap.Strict as HM
109import qualified Data.HashMap.Strict as HM
95−import qualified Data.Map as M
96import Data.Monoid ((<>))
110import Data.Monoid ((<>))
111+import Data.Scientific (floatingOrInteger)
97import Data.Text (Text)
112import Data.Text (Text)
98import qualified Data.Text as T
113import qualified Data.Text as T
99import Data.Time.Clock (UTCTime)
114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
100import GHC.Generics (Generic)
116import GHC.Generics (Generic)
101import Prelude hiding (all, tail)
117import Prelude hiding (all, tail)
102import Text.Read (readMaybe)
118import Text.Read (readMaybe)
@@ -109,14 +125,20 @@ data Endpoint =
109 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
110 | StartContainerEndpoint StartOpts ContainerID
126 | StartContainerEndpoint StartOpts ContainerID
111 | StopContainerEndpoint Timeout ContainerID
127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
112 | KillContainerEndpoint Signal ContainerID
129 | KillContainerEndpoint Signal ContainerID
113 | RestartContainerEndpoint Timeout ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
114 | PauseContainerEndpoint ContainerID
131 | PauseContainerEndpoint ContainerID
115 | UnpauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
116 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
117 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
118− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
119 | InspectContainerEndpoint ContainerID
136 | 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
120 deriving (Eq, Show)
142 deriving (Eq, Show)
122-- | We should newtype this
144-- | We should newtype this
@@ -163,6 +185,20 @@ toImageID t =
163-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
164data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
186data 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"
166-- TODO: Add more Signals or use an existing lib
202-- TODO: Add more Signals or use an existing lib
167-- | Signal used for sending to the process running in the container.
203-- | Signal used for sending to the process running in the container.
168-- The default signal is SIGTERM.
204-- The default signal is SIGTERM.
@@ -177,16 +213,16 @@ data Signal = SIGHUP
178instance FromJSON Signal where
214instance FromJSON Signal where
179 parseJSON (JSON.String "SIGTERM") = return SIGTERM
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
180− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
216+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
181− parseJSON (JSON.String "SIGINT") = return SIGINT
217+ parseJSON (JSON.String "SIGINT") = return SIGINT
182 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
183 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
184 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
185− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
187instance ToJSON Signal where
223instance ToJSON Signal where
188− toJSON SIGHUP = "SIGHUP"
224+ toJSON SIGHUP = "SIGHUP"
189− toJSON SIGINT = "SIGINT"
225+ toJSON SIGINT = "SIGINT"
190 toJSON SIGQUIT = "SIGQUIT"
226 toJSON SIGQUIT = "SIGQUIT"
191 toJSON SIGSTOP = "SIGSTOP"
227 toJSON SIGSTOP = "SIGSTOP"
192 toJSON SIGTERM = "SIGTERM"
228 toJSON SIGTERM = "SIGTERM"
@@ -214,7 +250,7 @@ data ContainerDetails = ContainerDetails {
214 , processLabel :: Text
250 , processLabel :: Text
215 , resolveConfPath :: FilePath
251 , resolveConfPath :: FilePath
216 , restartCount :: Int
252 , restartCount :: Int
217− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
218 , mounts :: [Mount]
254 , mounts :: [Mount]
220 deriving (Eq, Show, Generic)
256 deriving (Eq, Show, Generic)
@@ -222,11 +258,11 @@ data ContainerDetails = ContainerDetails {
222-- | Data type used for parsing the mount information from a container
258-- | Data type used for parsing the mount information from a container
224data Mount = Mount {
260data Mount = Mount {
225− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
226 , mountSource :: FilePath
262 , mountSource :: FilePath
227 , mountDestination :: FilePath
263 , mountDestination :: FilePath
228− , mountDriver :: Text
264+ , mountDriver :: Maybe Text
229− , mountMode :: Maybe VolumePermission -- apparently this can be null
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
230 , mountRW :: Bool
266 , mountRW :: Bool
231 , mountPropogation :: Text
267 , mountPropogation :: Text
@@ -234,14 +270,14 @@ data Mount = Mount {
235instance FromJSON Mount where
271instance FromJSON Mount where
236 parseJSON (JSON.Object o) = do
272 parseJSON (JSON.Object o) = do
237− name <- o .: "Name"
273+ name <- o .:? "Name"
238 src <- o .: "Source"
274 src <- o .: "Source"
239 dest <- o .: "Destination"
275 dest <- o .: "Destination"
240− driver <- o .: "Driver"
276+ driver <- o .:? "Driver"
241− mode <- o .: "Mode"
277+ -- mode <- o .: "Mode"
242 rw <- o .: "RW"
278 rw <- o .: "RW"
243 prop <- o .: "Propagation"
279 prop <- o .: "Propagation"
244− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
245 parseJSON _ = fail "Mount is not an object"
281 parseJSON _ = fail "Mount is not an object"
247-- | Data type used for parsing the container state from a list of
283-- | Data type used for parsing the container state from a list of
@@ -257,7 +293,7 @@ data ContainerState = ContainerState {
257 , restarting :: Bool
293 , restarting :: Bool
258 , running :: Bool
294 , running :: Bool
259 , startedAt :: UTCTime
295 , startedAt :: UTCTime
260− , status :: Status
296+ , state :: State
262 deriving (Eq, Show, Generic)
298 deriving (Eq, Show, Generic)
@@ -420,20 +456,17 @@ instance FromJSON NetworkOptions where
420 parseJSON _ = fail "NetworkOptions is not an object"
456 parseJSON _ = fail "NetworkOptions is not an object"
422-- TODO: Not sure what this is used for anymore.
458-- TODO: Not sure what this is used for anymore.
423−newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
459+data Network = Network NetworkMode NetworkOptions
424 deriving (Eq, Show)
460 deriving (Eq, Show)
426−instance FromJSON Networks where
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
427− parseJSON (JSON.Object o) = do
463+ parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
428− Networks <$> HM.foldlWithKey' f (return M.empty) o
431 f accM k' v' = do
465 f accM k' v' = do
432 acc <- accM
466 acc <- accM
433 k <- parseJSON $ JSON.String k'
467 k <- parseJSON $ JSON.String k'
434 v <- parseJSON v'
468 v <- parseJSON v'
435− return $ M.insert k v acc
469+ return $ (Network k v):acc
437 parseJSON _ = fail "Networks is not an object"
470 parseJSON _ = fail "Networks is not an object"
439-- | Data type reprsenting the various network settings a container can have.
472-- | Data type reprsenting the various network settings a container can have.
@@ -455,7 +488,7 @@ data NetworkSettings = NetworkSettings {
455 , networkSettingsIpPrefixLen :: Int
488 , networkSettingsIpPrefixLen :: Int
456 , networkSettingsIpv6Gateway :: Text
489 , networkSettingsIpv6Gateway :: Text
457 , networkSettingsMacAddress :: Text
490 , networkSettingsMacAddress :: Text
458− , networkSettingsNetworks :: Networks
491+ , networkSettingsNetworks :: [Network]
460 deriving (Eq, Show)
493 deriving (Eq, Show)
@@ -490,21 +523,23 @@ data Container = Container
490 , containerImageId :: ImageID
523 , containerImageId :: ImageID
491 , containerCommand :: Text
524 , containerCommand :: Text
492 , containerCreatedAt :: Int
525 , containerCreatedAt :: Int
526+ , containerState :: State
493− , containerStatus :: Status
527+ , containerStatus :: Maybe Text
494 , containerPorts :: [ContainerPortInfo]
528 , containerPorts :: [ContainerPortInfo]
495 , containerLabels :: [Label]
529 , containerLabels :: [Label]
496− , containerNetworks :: Networks
530+ , containerNetworks :: [Network]
497 , containerMounts :: [Mount]
531 , containerMounts :: [Mount]
498 } deriving (Show, Eq)
532 } deriving (Show, Eq)
500instance FromJSON Container where
534instance FromJSON Container where
501− parseJSON (JSON.Object v) =
535+ parseJSON o@(JSON.Object v) =
502− Container <$> (v .: "Id")
536+ Container <$> parseJSON o
503 <*> (v .: "Names")
537 <*> (v .: "Names")
504 <*> (v .: "Image")
538 <*> (v .: "Image")
505− <*> (v .: "ImageID")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
506− <*> (v .: "Command")
540+ <*> (v .: "Command") -- Doesn't exist anymore
507 <*> (v .: "Created")
541 <*> (v .: "Created")
508 <*> (v .: "Status")
543 <*> (v .: "Status")
509 <*> (v .: "Ports")
544 <*> (v .: "Ports")
510 <*> (v .: "Labels")
545 <*> (v .: "Labels")
@@ -514,21 +549,20 @@ instance FromJSON Container where
514 parseNetworks (JSON.Object v) =
549 parseNetworks (JSON.Object v) =
515 (v .: "Networks") >>= parseJSON
550 (v .: "Networks") >>= parseJSON
516 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
518 parseJSON _ = fail "Container: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
520−-- | Represents the status of the container life cycle.
554+-- | Represents the state of the container life cycle.
521−data Status = Created | Restarting | Running | Paused | Exited | Dead
555+data State = Created | Restarting | Running | Paused | Exited | Dead
522 deriving (Eq, Show, Generic)
556 deriving (Eq, Show, Generic)
524−instance FromJSON Status where
558+instance FromJSON State where
525− parseJSON (JSON.String "running") = return Running
559+ parseJSON (JSON.String "running") = return Running
526− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
560+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
527 parseJSON (JSON.String "restarting") = return Restarting
561 parseJSON (JSON.String "restarting") = return Restarting
528− parseJSON (JSON.String "paused") = return Paused
562+ parseJSON (JSON.String "paused") = return Paused
529− parseJSON (JSON.String "exited") = return Exited
563+ parseJSON (JSON.String "exited") = return Exited
530− parseJSON (JSON.String "dead") = return Dead
564+ parseJSON (JSON.String "dead") = return Dead
531− parseJSON _ = fail "Unknown Status"
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
533-- | Alias for representing a RepoDigest. We could newtype this and add
567-- | Alias for representing a RepoDigest. We could newtype this and add
534-- some validation.
568-- some validation.
@@ -540,13 +574,13 @@ data Label = Label Name Value deriving (Eq, Show)
541-- If there are multiple lables with the same Name in the list
575-- If there are multiple lables with the same Name in the list
542-- then the last one wins.
576-- then the last one wins.
543−instance ToJSON [Label] where
577+instance {-# OVERLAPPING #-} ToJSON [Label] where
544 toJSON [] = emptyJsonObject
578 toJSON [] = emptyJsonObject
545 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
579 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
546 where key (Label k _) = T.unpack k
580 where key (Label k _) = T.unpack k
547 val (Label _ v) = v
581 val (Label _ v) = v
549−instance FromJSON [Label] where
583+instance {-# OVERLAPPING #-} FromJSON [Label] where
550 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
584 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
551 where f accM k v = do
585 where f accM k v = do
552 acc <- accM
586 acc <- accM
@@ -563,8 +597,8 @@ data Image = DockerImage {
563 imageId :: ImageID
597 imageId :: ImageID
564 , imageCreated :: Integer
598 , imageCreated :: Integer
565 , imageParentId :: Maybe ImageID
599 , imageParentId :: Maybe ImageID
566− , imageRepoTags :: Maybe [Tag]
600+ , imageRepoTags :: [Tag]
567− , imageRepoDigests :: Maybe [Digest]
601+ , imageRepoDigests :: [Digest]
568 , imageSize :: Integer
602 , imageSize :: Integer
569 , imageVirtualSize :: Integer
603 , imageVirtualSize :: Integer
570 , imageLabels :: [Label]
604 , imageLabels :: [Label]
@@ -581,30 +615,54 @@ instance FromJSON Image where
581 imageId <- o .: "Id"
615 imageId <- o .: "Id"
582 imageCreated <- o .: "Created"
616 imageCreated <- o .: "Created"
583 imageParentId <- o .:? "ParentId"
617 imageParentId <- o .:? "ParentId"
584− imageRepoTags <- o .:? "RepoTags"
618+ imageRepoTags <- o .:? "RepoTags" .!= []
585− imageRepoDigests <- o .:? "RepoDigests"
619+ imageRepoDigests <- o .:? "RepoDigests" .!= []
586 imageSize <- o .: "Size"
620 imageSize <- o .: "Size"
587 imageVirtualSize <- o .: "VirtualSize"
621 imageVirtualSize <- o .: "VirtualSize"
588− imageLabels <- case HM.lookup "Labels" o of
622+ imageLabels <- o .:? "Labels" .!= []
589− Just ls -> parseJSON ls
590− Nothing -> return []
591 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
592 parseJSON _ = fail "Failed to parse DockerImage."
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
595-- | Options used for creating a Container.
650-- | Options used for creating a Container.
596data CreateOpts = CreateOpts {
651data CreateOpts = CreateOpts {
597− containerConfig :: ContainerConfig
652+ containerConfig :: ContainerConfig
598− , hostConfig :: HostConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
599 } deriving (Eq, Show)
655 } deriving (Eq, Show)
601instance ToJSON CreateOpts where
657instance ToJSON CreateOpts where
602− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
603 let ccJSON = toJSON cc
659 let ccJSON = toJSON cc
604 let hcJSON = toJSON hc
660 let hcJSON = toJSON hc
605 case ccJSON of
661 case ccJSON of
606 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
607− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
608 _ -> error "ContainerConfig is not an object." -- This should never happen.
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
610-- | Container configuration used for creating a container with sensible
668-- | Container configuration used for creating a container with sensible
@@ -626,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
627 , volumes=[]
685 , volumes=[]
628 , workingDir=Nothing
686 , workingDir=Nothing
629− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
630 , networkDisabled=Nothing
688 , networkDisabled=Nothing
631 , macAddress=Nothing
689 , macAddress=Nothing
632 , labels=[]
690 , labels=[]
@@ -639,7 +697,7 @@ defaultHostConfig = HostConfig {
640 , containerIDFile=Nothing
698 , containerIDFile=Nothing
641 , logConfig=LogDriverConfig JsonFile []
699 , logConfig=LogDriverConfig JsonFile []
642− , networkMode=Bridge
700+ , networkMode=NetworkBridge
643 , portBindings=[]
701 , portBindings=[]
644 , restartPolicy=RestartOff
702 , restartPolicy=RestartOff
645 , volumeDriver=Nothing
703 , volumeDriver=Nothing
@@ -679,14 +737,18 @@ defaultContainerResources = ContainerResources {
679 , memory=Nothing
737 , memory=Nothing
680 , memoryReservation=Nothing
738 , memoryReservation=Nothing
681 , memorySwap=Nothing
739 , memorySwap=Nothing
682− , oomKillDisable=False
740+ , oomKillDisable=Just False
683 , ulimits=[]
741 , ulimits=[]
686-- | Default create options when creating a container. You only need to
744-- | Default create options when creating a container. You only need to
687-- specify an image name and the rest is all sensible defaults.
745-- specify an image name and the rest is all sensible defaults.
688defaultCreateOpts :: T.Text -> CreateOpts
746defaultCreateOpts :: T.Text -> CreateOpts
747+defaultCreateOpts imageName = CreateOpts
689−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
691-- | Override the key sequence for detaching a container.
753-- | Override the key sequence for detaching a container.
692-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -700,16 +762,45 @@ defaultStartOpts :: StartOpts
700defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
702-- | Options for deleting a container.
764-- | Options for deleting a container.
703−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
704 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
705 , force :: Bool -- ^ If the container is still running force deletion anyway.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
706 } deriving (Eq, Show)
768 } 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
708-- | Default options for deleting a container. Most of the time we DON'T
792-- | Default options for deleting a container. Most of the time we DON'T
709-- want to delete the container's volumes or force delete it if it's
793-- want to delete the container's volumes or force delete it if it's
710-- running.
794-- running.
711−defaultDeleteOpts :: DeleteOpts
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
712−defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
796+defaultContainerDeleteOpts = ContainerDeleteOpts { 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
714-- | Timestamp alias.
805-- | Timestamp alias.
715type Timestamp = Integer
806type Timestamp = Integer
@@ -737,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
737 , tail = All
828 , 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
740-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
741-- | Set permissions on volumes that you mount in the container.
862-- | Set permissions on volumes that you mount in the container.
742data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
744instance ToJSON VolumePermission where
865instance ToJSON VolumePermission where
745 toJSON ReadWrite = "rw"
866 toJSON ReadWrite = "rw"
746− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
748instance FromJSON VolumePermission where
869instance FromJSON VolumePermission where
749 parseJSON "rw" = return ReadWrite
870 parseJSON "rw" = return ReadWrite
750 parseJSON "ro" = return ReadOnly
871 parseJSON "ro" = return ReadOnly
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
751− parseJSON _ = fail "Failed to parse VolumePermission"
874+ parseJSON _ = fail "Failed to parse VolumePermission"
753-- | Used for marking a directory in the container as "exposed" hence
876-- | Used for marking a directory in the container as "exposed" hence
754-- taking it outside of the COW filesystem and making it mountable
877-- taking it outside of the COW filesystem and making it mountable
@@ -763,15 +886,15 @@ instance FromJSON VolumePermission where
764newtype Volume = Volume FilePath deriving (Eq, Show)
887newtype Volume = Volume FilePath deriving (Eq, Show)
766−instance ToJSON [Volume] where
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
767 toJSON [] = emptyJsonObject
890 toJSON [] = emptyJsonObject
768 toJSON (v:vs) = toJsonKey (v:vs) getKey
891 toJSON (v:vs) = toJsonKey (v:vs) getKey
769 where getKey (Volume v) = v
892 where getKey (Volume v) = v
771−instance FromJSON [Volume] where
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
772 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
773− parseJSON (JSON.Null) = return []
896+ parseJSON (JSON.Null) = return []
774− parseJSON _ = fail "Volume is not an object"
897+ parseJSON _ = fail "Volume is not an object"
777data Bind = Bind { hostSrc :: Text
900data Bind = Bind { hostSrc :: Text
@@ -781,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
782instance FromJSON Bind where
905instance FromJSON Bind where
783 parseJSON (JSON.String t) = case T.split (== ':') t of
906 parseJSON (JSON.String t) = case T.split (== ':') t of
784− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
785 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
786 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
787− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
788 parseJSON _ = fail "Bind is not a string"
911 parseJSON _ = fail "Bind is not a string"
790data Device = Device {
913data Device = Device {
@@ -807,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
808instance FromJSON VolumeFrom where
931instance FromJSON VolumeFrom where
809 parseJSON (JSON.String t) = case T.split (== ':') t of
932 parseJSON (JSON.String t) = case T.split (== ':') t of
810− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
811 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
812 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
813− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
814 parseJSON _ = fail "VolumeFrom is not a string"
937 parseJSON _ = fail "VolumeFrom is not a string"
816instance ToJSON VolumeFrom where
939instance ToJSON VolumeFrom where
817 toJSON (VolumeFrom n p) = case p of
940 toJSON (VolumeFrom n p) = case p of
818− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
819 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
821instance ToJSON Bind where
944instance ToJSON Bind where
@@ -827,51 +950,51 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
828instance FromJSON Link where
951instance FromJSON Link where
829 parseJSON (JSON.String t) = case T.split (== ':') t of
952 parseJSON (JSON.String t) = case T.split (== ':') t of
830− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
831 [f,s] -> return $ Link f $ Just s
954 [f,s] -> return $ Link f $ Just s
832− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
833 parseJSON _ = fail "Link is not a string"
956 parseJSON _ = fail "Link is not a string"
835instance ToJSON Link where
958instance ToJSON Link where
836 toJSON (Link n1 n2) = toJSON $ case n2 of
959 toJSON (Link n1 n2) = toJSON $ case n2 of
837 Nothing -> T.concat[n1, ":", n1] -- use same name in container
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
838− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
840-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
841data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
843instance FromJSON LogDriverType where
966instance FromJSON LogDriverType where
844 parseJSON (JSON.String "json-file") = return JsonFile
967 parseJSON (JSON.String "json-file") = return JsonFile
845− parseJSON (JSON.String "syslog") = return Syslog
968+ parseJSON (JSON.String "syslog") = return Syslog
846− parseJSON (JSON.String "journald") = return Journald
969+ parseJSON (JSON.String "journald") = return Journald
847− parseJSON (JSON.String "gelf") = return Gelf
970+ parseJSON (JSON.String "gelf") = return Gelf
848− parseJSON (JSON.String "fluentd") = return Fluentd
971+ parseJSON (JSON.String "fluentd") = return Fluentd
849− parseJSON (JSON.String "awslogs") = return AwsLogs
972+ parseJSON (JSON.String "awslogs") = return AwsLogs
850− parseJSON (JSON.String "splunk") = return Splunk
973+ parseJSON (JSON.String "splunk") = return Splunk
851− parseJSON (JSON.String "etwlogs") = return Etwlogs
974+ parseJSON (JSON.String "etwlogs") = return Etwlogs
852− parseJSON (JSON.String "none") = return LoggingDisabled
975+ parseJSON (JSON.String "none") = return LoggingDisabled
853− parseJSON _ = fail "Unknown LogDriverType"
976+ parseJSON _ = fail "Unknown LogDriverType"
855instance ToJSON LogDriverType where
978instance ToJSON LogDriverType where
856− toJSON JsonFile = JSON.String "json-file"
979+ toJSON JsonFile = JSON.String "json-file"
857− toJSON Syslog = JSON.String "syslog"
980+ toJSON Syslog = JSON.String "syslog"
858− toJSON Journald = JSON.String "journald"
981+ toJSON Journald = JSON.String "journald"
859− toJSON Gelf = JSON.String "gelf"
982+ toJSON Gelf = JSON.String "gelf"
860− toJSON Fluentd = JSON.String "fluentd"
983+ toJSON Fluentd = JSON.String "fluentd"
861− toJSON AwsLogs = JSON.String "awslogs"
984+ toJSON AwsLogs = JSON.String "awslogs"
862− toJSON Splunk = JSON.String "splunk"
985+ toJSON Splunk = JSON.String "splunk"
863− toJSON Etwlogs = JSON.String "etwlogs"
986+ toJSON Etwlogs = JSON.String "etwlogs"
864 toJSON LoggingDisabled = JSON.String "none"
987 toJSON LoggingDisabled = JSON.String "none"
866data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
868−instance ToJSON [LogDriverOption] where
991+instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
869 toJSON [] = emptyJsonObject
992 toJSON [] = emptyJsonObject
870 toJSON (o:os) = toJsonKeyVal (o:os) key val
993 toJSON (o:os) = toJsonKeyVal (o:os) key val
871 where key (LogDriverOption n _) = T.unpack n
994 where key (LogDriverOption n _) = T.unpack n
872 val (LogDriverOption _ v) = v
995 val (LogDriverOption _ v) = v
874−instance FromJSON [LogDriverOption] where
997+instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
875 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
998 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
876 where f accM k v = do
999 where f accM k v = do
877 acc <- accM
1000 acc <- accM
@@ -894,19 +1017,41 @@ instance FromJSON LogDriverConfig where
894 parseJSON _ = fail "LogDriverConfig is not an object"
1017 parseJSON _ = fail "LogDriverConfig is not an object"
896-- TODO: Add container:<name|id> mode
1019-- TODO: Add container:<name|id> mode
897−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
898 deriving (Eq, Show, Ord)
1021 deriving (Eq, Show, Ord)
900instance FromJSON NetworkMode where
1023instance FromJSON NetworkMode where
901− parseJSON (JSON.String "bridge") = return Bridge
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
902− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
903− parseJSON (JSON.String "none") = return NetworkDisabled
1026+ parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
904− parseJSON _ = fail "Unknown NetworkMode"
1028+ parseJSON _ = fail "Unknown NetworkMode"
906instance ToJSON NetworkMode where
1030instance ToJSON NetworkMode where
907− toJSON Bridge = JSON.String "bridge"
1031+ toJSON NetworkBridge = JSON.String "bridge"
908− toJSON Host = JSON.String "host"
1032+ toJSON NetworkHost = JSON.String "host"
909 toJSON NetworkDisabled = JSON.String "none"
1033 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]
911data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -922,7 +1067,7 @@ instance FromJSON PortType where
922 parseJSON val = case val of
1067 parseJSON val = case val of
923 "tcp" -> return TCP
1068 "tcp" -> return TCP
924 "udp" -> return UDP
1069 "udp" -> return UDP
925− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
927-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1003,7 +1148,7 @@ addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1003 oldeps = exposedPorts cc
1148 oldeps = exposedPorts cc
1006−instance FromJSON [PortBinding] where
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1007 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1152 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1009 f accM k v = case T.split (== '/') k of
1154 f accM k v = case T.split (== '/') k of
@@ -1017,7 +1162,7 @@ instance FromJSON [PortBinding] where
1017 parseJSON (JSON.Null) = return []
1162 parseJSON (JSON.Null) = return []
1018 parseJSON _ = fail "PortBindings is not an object"
1163 parseJSON _ = fail "PortBindings is not an object"
1020−instance ToJSON [PortBinding] where
1165+instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1021 toJSON [] = emptyJsonObject
1166 toJSON [] = emptyJsonObject
1022 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1167 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1023 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1168 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
@@ -1052,7 +1197,7 @@ instance FromJSON RestartPolicy where
1052 "on-failure" -> do
1197 "on-failure" -> do
1053 retry <- o .: "MaximumRetryCount"
1198 retry <- o .: "MaximumRetryCount"
1054 return $ RestartOnFailure retry
1199 return $ RestartOnFailure retry
1055− "off" -> return RestartOff
1200+ "no" -> return RestartOff
1056 _ -> fail "Could not parse RestartPolicy"
1201 _ -> fail "Could not parse RestartPolicy"
1057 parseJSON _ = fail "RestartPolicy is not an object"
1202 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1060,7 +1205,7 @@ instance ToJSON RestartPolicy where
1060 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1061 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1062 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1063− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
1065data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1233,6 +1378,22 @@ instance ToJSON DeviceRate where
1233 , "Rate" .= r
1378 , "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"
1236data ContainerResources = ContainerResources {
1397data ContainerResources = ContainerResources {
1237 cpuShares :: Maybe Integer
1398 cpuShares :: Maybe Integer
1238 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1248,12 +1409,12 @@ data ContainerResources = ContainerResources {
1248 , cpusetMems :: Maybe Text
1409 , cpusetMems :: Maybe Text
1249 , devices :: [Device]
1410 , devices :: [Device]
1250 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1251− , kernelMemory :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1252− , memory :: Maybe Integer
1413+ , memory :: Maybe MemoryConstraint
1253− , memoryReservation :: Maybe Integer
1414+ , memoryReservation :: Maybe MemoryConstraint
1254− , memorySwap :: Maybe Integer
1415+ , memorySwap :: Maybe MemoryConstraint
1255 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1256− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
1257 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1258 , ulimits :: [Ulimit]
1419 , ulimits :: [Ulimit]
1259 -- TODO: Missing from 1.24
1420 -- TODO: Missing from 1.24
@@ -1291,7 +1452,7 @@ instance FromJSON EnvVar where
1291 parseJSON _ = fail "EnvVar is not a string"
1452 parseJSON _ = fail "EnvVar is not a string"
1293instance ToJSON EnvVar where
1454instance ToJSON EnvVar where
1294− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1296-- | ExposedPort represents a port (and it's type)
1457-- | ExposedPort represents a port (and it's type)
1297-- that a container should expose to other containers or the host system.
1458-- that a container should expose to other containers or the host system.
@@ -1312,7 +1473,7 @@ instance ToJSON EnvVar where
1313data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1474data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1315−instance FromJSON [ExposedPort] where
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1316 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1477 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1318 f accM k _ = case T.split (== '/') k of
1479 f accM k _ = case T.split (== '/') k of
@@ -1325,12 +1486,27 @@ instance FromJSON [ExposedPort] where
1325 parseJSON (JSON.Null) = return []
1486 parseJSON (JSON.Null) = return []
1326 parseJSON _ = fail "ExposedPorts is not an object"
1487 parseJSON _ = fail "ExposedPorts is not an object"
1328−instance ToJSON [ExposedPort] where
1489+instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1329 toJSON [] = emptyJsonObject
1490 toJSON [] = emptyJsonObject
1330 toJSON (p:ps) = toJsonKey (p:ps) key
1491 toJSON (p:ps) = toJsonKey (p:ps) key
1331 where key (ExposedPort p t) = show p <> slash <> show t
1492 where key (ExposedPort p t) = show p <> slash <> show t
1332 slash = T.unpack "/"
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
1502+ parseJSON (JSON.String e) = return $ Entrypoint [e]
1503+ parseJSON (JSON.Array ar) = do
1504+ arr <- mapM parseJSON (V.toList ar)
1505+ return $ Entrypoint arr
1506+ parseJSON JSON.Null = return $ Entrypoint []
1507+ parseJSON _ = fail "Failed to parse Entrypoint"
1334data ContainerConfig = ContainerConfig {
1510data ContainerConfig = ContainerConfig {
1335 hostname :: Maybe Text
1511 hostname :: Maybe Text
1336 , domainname :: Maybe Text
1512 , domainname :: Maybe Text
@@ -1349,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
1349 , image :: Text
1525 , image :: Text
1350 , volumes :: [Volume]
1526 , volumes :: [Volume]
1351 , workingDir :: Maybe FilePath
1527 , workingDir :: Maybe FilePath
1352− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
1353 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1354 , macAddress :: Maybe Text
1530 , macAddress :: Maybe Text
1355 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1357,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
1357 , stopSignal :: Signal
1533 , stopSignal :: Signal
1358 } deriving (Eq, Show, Generic)
1534 } deriving (Eq, Show, Generic)
1360instance ToJSON ContainerConfig where
1537instance ToJSON ContainerConfig where
1361 toJSON = genericToJSON defaultOptions {
1538 toJSON = genericToJSON defaultOptions {
1362 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1369,9 +1546,7 @@ instance FromJSON ContainerConfig where
1369 attachStdin <- o .: "AttachStdin"
1546 attachStdin <- o .: "AttachStdin"
1370 attachStdout <- o .: "AttachStdout"
1547 attachStdout <- o .: "AttachStdout"
1371 attachStderr <- o .: "AttachStderr"
1548 attachStderr <- o .: "AttachStderr"
1372− exposedPorts <- case HM.lookup "ExposedPorts" o of
1549+ exposedPorts <- o .:? "ExposedPorts" .!= []
1373− Just eps -> parseJSON eps
1374− Nothing -> return []
1375 tty <- o .: "Tty"
1550 tty <- o .: "Tty"
1376 openStdin <- o .: "OpenStdin"
1551 openStdin <- o .: "OpenStdin"
1377 stdinOnce <- o .: "StdinOnce"
1552 stdinOnce <- o .: "StdinOnce"
@@ -1380,18 +1555,20 @@ instance FromJSON ContainerConfig where
1380 image <- o .: "Image"
1555 image <- o .: "Image"
1381 volumes <- o .: "Volumes"
1556 volumes <- o .: "Volumes"
1382 workingDir <- o .:? "WorkingDir"
1557 workingDir <- o .:? "WorkingDir"
1383− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
1384 networkDisabled <- o .:? "networkDisabled"
1559 networkDisabled <- o .:? "networkDisabled"
1385 macAddress <- o .:? "MacAddress"
1560 macAddress <- o .:? "MacAddress"
1386− labels <- case HM.lookup "Labels" o of
1561+ labels <- o .:? "Labels" .!= []
1387− Just ls -> parseJSON ls
1388− Nothing -> return []
1389 stopSignal <- o .: "StopSignal"
1562 stopSignal <- o .: "StopSignal"
1390 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1563 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1391 macAddress labels stopSignal
1564 macAddress labels stopSignal
1392 parseJSON _ = fail "NetworkSettings is not an object."
1565 parseJSON _ = fail "NetworkSettings is not an object."
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1394parseIntegerText :: (Monad m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1395parseIntegerText t = case readMaybe $ T.unpack t of
1572parseIntegerText t = case readMaybe $ T.unpack t of
1396 Nothing ->
1573 Nothing ->
1397 fail "Could not parse Integer"
1574 fail "Could not parse Integer"
@@ -1413,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1413-- | Helper function that return an empty dictionary "{}"
1590-- | Helper function that return an empty dictionary "{}"
1414emptyJsonObject :: JSON.Value
1591emptyJsonObject :: JSON.Value
1415emptyJsonObject = JSON.Object HM.empty
1592emptyJsonObject = JSON.Object HM.empty