@@ -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(..)
@@ -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,
@@ -93,9 +108,11 @@ import 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
95import Data.Monoid ((<>))
110import Data.Monoid ((<>))
111+import Data.Scientific (floatingOrInteger)
96import Data.Text (Text)
112import Data.Text (Text)
97import qualified Data.Text as T
113import qualified Data.Text as T
98import Data.Time.Clock (UTCTime)
114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
99import GHC.Generics (Generic)
116import GHC.Generics (Generic)
100import Prelude hiding (all, tail)
117import Prelude hiding (all, tail)
101import Text.Read (readMaybe)
118import Text.Read (readMaybe)
@@ -108,14 +125,20 @@ data Endpoint =
108 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
109 | StartContainerEndpoint StartOpts ContainerID
126 | StartContainerEndpoint StartOpts ContainerID
110 | StopContainerEndpoint Timeout ContainerID
127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
111 | KillContainerEndpoint Signal ContainerID
129 | KillContainerEndpoint Signal ContainerID
112 | RestartContainerEndpoint Timeout ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
113 | PauseContainerEndpoint ContainerID
131 | PauseContainerEndpoint ContainerID
114 | UnpauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
115 | 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.
116 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
117− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
118 | 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
119 deriving (Eq, Show)
142 deriving (Eq, Show)
121-- | We should newtype this
144-- | We should newtype this
@@ -162,6 +185,20 @@ toImageID t =
162-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
163data 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"
165-- TODO: Add more Signals or use an existing lib
202-- TODO: Add more Signals or use an existing lib
166-- | Signal used for sending to the process running in the container.
203-- | Signal used for sending to the process running in the container.
167-- The default signal is SIGTERM.
204-- The default signal is SIGTERM.
@@ -176,16 +213,16 @@ data Signal = SIGHUP
177instance FromJSON Signal where
214instance FromJSON Signal where
178 parseJSON (JSON.String "SIGTERM") = return SIGTERM
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
179− 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.
180− parseJSON (JSON.String "SIGINT") = return SIGINT
217+ parseJSON (JSON.String "SIGINT") = return SIGINT
181 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
182 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
183 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
184− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
186instance ToJSON Signal where
223instance ToJSON Signal where
187− toJSON SIGHUP = "SIGHUP"
224+ toJSON SIGHUP = "SIGHUP"
188− toJSON SIGINT = "SIGINT"
225+ toJSON SIGINT = "SIGINT"
189 toJSON SIGQUIT = "SIGQUIT"
226 toJSON SIGQUIT = "SIGQUIT"
190 toJSON SIGSTOP = "SIGSTOP"
227 toJSON SIGSTOP = "SIGSTOP"
191 toJSON SIGTERM = "SIGTERM"
228 toJSON SIGTERM = "SIGTERM"
@@ -213,7 +250,7 @@ data ContainerDetails = ContainerDetails {
213 , processLabel :: Text
250 , processLabel :: Text
214 , resolveConfPath :: FilePath
251 , resolveConfPath :: FilePath
215 , restartCount :: Int
252 , restartCount :: Int
216− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
217 , mounts :: [Mount]
254 , mounts :: [Mount]
219 deriving (Eq, Show, Generic)
256 deriving (Eq, Show, Generic)
@@ -221,11 +258,11 @@ data ContainerDetails = ContainerDetails {
221-- | Data type used for parsing the mount information from a container
258-- | Data type used for parsing the mount information from a container
223data Mount = Mount {
260data Mount = Mount {
224− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
225 , mountSource :: FilePath
262 , mountSource :: FilePath
226 , mountDestination :: FilePath
263 , mountDestination :: FilePath
227− , mountDriver :: Text
264+ , mountDriver :: Maybe Text
228− , mountMode :: Maybe VolumePermission -- apparently this can be null
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
229 , mountRW :: Bool
266 , mountRW :: Bool
230 , mountPropogation :: Text
267 , mountPropogation :: Text
@@ -233,14 +270,14 @@ data Mount = Mount {
234instance FromJSON Mount where
271instance FromJSON Mount where
235 parseJSON (JSON.Object o) = do
272 parseJSON (JSON.Object o) = do
236− name <- o .: "Name"
273+ name <- o .:? "Name"
237 src <- o .: "Source"
274 src <- o .: "Source"
238 dest <- o .: "Destination"
275 dest <- o .: "Destination"
239− driver <- o .: "Driver"
276+ driver <- o .:? "Driver"
240− mode <- o .: "Mode"
277+ -- mode <- o .: "Mode"
241 rw <- o .: "RW"
278 rw <- o .: "RW"
242 prop <- o .: "Propagation"
279 prop <- o .: "Propagation"
243− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
244 parseJSON _ = fail "Mount is not an object"
281 parseJSON _ = fail "Mount is not an object"
246-- | 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
@@ -256,7 +293,7 @@ data ContainerState = ContainerState {
256 , restarting :: Bool
293 , restarting :: Bool
257 , running :: Bool
294 , running :: Bool
258 , startedAt :: UTCTime
295 , startedAt :: UTCTime
259− , status :: Status
296+ , state :: State
261 deriving (Eq, Show, Generic)
298 deriving (Eq, Show, Generic)
@@ -422,7 +459,7 @@ instance FromJSON NetworkOptions where
422data Network = Network NetworkMode NetworkOptions
459data Network = Network NetworkMode NetworkOptions
423 deriving (Eq, Show)
460 deriving (Eq, Show)
425−instance FromJSON [Network] where
462+instance {-# OVERLAPPING #-} FromJSON [Network] where
426 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
463 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
428 f accM k' v' = do
465 f accM k' v' = do
@@ -486,7 +523,8 @@ data Container = Container
486 , containerImageId :: ImageID
523 , containerImageId :: ImageID
487 , containerCommand :: Text
524 , containerCommand :: Text
488 , containerCreatedAt :: Int
525 , containerCreatedAt :: Int
526+ , containerState :: State
489− , containerStatus :: Status
527+ , containerStatus :: Maybe Text
490 , containerPorts :: [ContainerPortInfo]
528 , containerPorts :: [ContainerPortInfo]
491 , containerLabels :: [Label]
529 , containerLabels :: [Label]
492 , containerNetworks :: [Network]
530 , containerNetworks :: [Network]
@@ -494,13 +532,14 @@ data Container = Container
494 } deriving (Show, Eq)
532 } deriving (Show, Eq)
496instance FromJSON Container where
534instance FromJSON Container where
497− parseJSON (JSON.Object v) =
535+ parseJSON o@(JSON.Object v) =
498− Container <$> (v .: "Id")
536+ Container <$> parseJSON o
499 <*> (v .: "Names")
537 <*> (v .: "Names")
500 <*> (v .: "Image")
538 <*> (v .: "Image")
501− <*> (v .: "ImageID")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
502− <*> (v .: "Command")
540+ <*> (v .: "Command") -- Doesn't exist anymore
503 <*> (v .: "Created")
541 <*> (v .: "Created")
504 <*> (v .: "Status")
543 <*> (v .: "Status")
505 <*> (v .: "Ports")
544 <*> (v .: "Ports")
506 <*> (v .: "Labels")
545 <*> (v .: "Labels")
@@ -510,21 +549,20 @@ instance FromJSON Container where
510 parseNetworks (JSON.Object v) =
549 parseNetworks (JSON.Object v) =
511 (v .: "Networks") >>= parseJSON
550 (v .: "Networks") >>= parseJSON
512 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
514 parseJSON _ = fail "Container: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
516−-- | Represents the status of the container life cycle.
554+-- | Represents the state of the container life cycle.
517−data Status = Created | Restarting | Running | Paused | Exited | Dead
555+data State = Created | Restarting | Running | Paused | Exited | Dead
518 deriving (Eq, Show, Generic)
556 deriving (Eq, Show, Generic)
520−instance FromJSON Status where
558+instance FromJSON State where
521− parseJSON (JSON.String "running") = return Running
559+ parseJSON (JSON.String "running") = return Running
522− 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.
523 parseJSON (JSON.String "restarting") = return Restarting
561 parseJSON (JSON.String "restarting") = return Restarting
524− parseJSON (JSON.String "paused") = return Paused
562+ parseJSON (JSON.String "paused") = return Paused
525− parseJSON (JSON.String "exited") = return Exited
563+ parseJSON (JSON.String "exited") = return Exited
526− parseJSON (JSON.String "dead") = return Dead
564+ parseJSON (JSON.String "dead") = return Dead
527− parseJSON _ = fail "Unknown Status"
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
529-- | Alias for representing a RepoDigest. We could newtype this and add
567-- | Alias for representing a RepoDigest. We could newtype this and add
530-- some validation.
568-- some validation.
@@ -536,13 +574,13 @@ data Label = Label Name Value deriving (Eq, Show)
537-- 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
538-- then the last one wins.
576-- then the last one wins.
539−instance ToJSON [Label] where
577+instance {-# OVERLAPPING #-} ToJSON [Label] where
540 toJSON [] = emptyJsonObject
578 toJSON [] = emptyJsonObject
541 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
579 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
542 where key (Label k _) = T.unpack k
580 where key (Label k _) = T.unpack k
543 val (Label _ v) = v
581 val (Label _ v) = v
545−instance FromJSON [Label] where
583+instance {-# OVERLAPPING #-} FromJSON [Label] where
546 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
584 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
547 where f accM k v = do
585 where f accM k v = do
548 acc <- accM
586 acc <- accM
@@ -559,8 +597,8 @@ data Image = DockerImage {
559 imageId :: ImageID
597 imageId :: ImageID
560 , imageCreated :: Integer
598 , imageCreated :: Integer
561 , imageParentId :: Maybe ImageID
599 , imageParentId :: Maybe ImageID
562− , imageRepoTags :: Maybe [Tag]
600+ , imageRepoTags :: [Tag]
563− , imageRepoDigests :: Maybe [Digest]
601+ , imageRepoDigests :: [Digest]
564 , imageSize :: Integer
602 , imageSize :: Integer
565 , imageVirtualSize :: Integer
603 , imageVirtualSize :: Integer
566 , imageLabels :: [Label]
604 , imageLabels :: [Label]
@@ -577,30 +615,54 @@ instance FromJSON Image where
577 imageId <- o .: "Id"
615 imageId <- o .: "Id"
578 imageCreated <- o .: "Created"
616 imageCreated <- o .: "Created"
579 imageParentId <- o .:? "ParentId"
617 imageParentId <- o .:? "ParentId"
580− imageRepoTags <- o .:? "RepoTags"
618+ imageRepoTags <- o .:? "RepoTags" .!= []
581− imageRepoDigests <- o .:? "RepoDigests"
619+ imageRepoDigests <- o .:? "RepoDigests" .!= []
582 imageSize <- o .: "Size"
620 imageSize <- o .: "Size"
583 imageVirtualSize <- o .: "VirtualSize"
621 imageVirtualSize <- o .: "VirtualSize"
584− imageLabels <- case HM.lookup "Labels" o of
622+ imageLabels <- o .:? "Labels" .!= []
585− Just ls -> parseJSON ls
586− Nothing -> return []
587 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
588 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
591-- | Options used for creating a Container.
650-- | Options used for creating a Container.
592data CreateOpts = CreateOpts {
651data CreateOpts = CreateOpts {
593− containerConfig :: ContainerConfig
652+ containerConfig :: ContainerConfig
594− , hostConfig :: HostConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
595 } deriving (Eq, Show)
655 } deriving (Eq, Show)
597instance ToJSON CreateOpts where
657instance ToJSON CreateOpts where
598− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
599 let ccJSON = toJSON cc
659 let ccJSON = toJSON cc
600 let hcJSON = toJSON hc
660 let hcJSON = toJSON hc
601 case ccJSON of
661 case ccJSON of
602 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
603− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
604 _ -> error "ContainerConfig is not an object." -- This should never happen.
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
606-- | Container configuration used for creating a container with sensible
668-- | Container configuration used for creating a container with sensible
@@ -622,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
623 , volumes=[]
685 , volumes=[]
624 , workingDir=Nothing
686 , workingDir=Nothing
625− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
626 , networkDisabled=Nothing
688 , networkDisabled=Nothing
627 , macAddress=Nothing
689 , macAddress=Nothing
628 , labels=[]
690 , labels=[]
@@ -635,7 +697,7 @@ defaultHostConfig = HostConfig {
636 , containerIDFile=Nothing
698 , containerIDFile=Nothing
637 , logConfig=LogDriverConfig JsonFile []
699 , logConfig=LogDriverConfig JsonFile []
638− , networkMode=Bridge
700+ , networkMode=NetworkBridge
639 , portBindings=[]
701 , portBindings=[]
640 , restartPolicy=RestartOff
702 , restartPolicy=RestartOff
641 , volumeDriver=Nothing
703 , volumeDriver=Nothing
@@ -675,14 +737,18 @@ defaultContainerResources = ContainerResources {
675 , memory=Nothing
737 , memory=Nothing
676 , memoryReservation=Nothing
738 , memoryReservation=Nothing
677 , memorySwap=Nothing
739 , memorySwap=Nothing
678− , oomKillDisable=False
740+ , oomKillDisable=Just False
679 , ulimits=[]
741 , ulimits=[]
682-- | Default create options when creating a container. You only need to
744-- | Default create options when creating a container. You only need to
683-- specify an image name and the rest is all sensible defaults.
745-- specify an image name and the rest is all sensible defaults.
684defaultCreateOpts :: T.Text -> CreateOpts
746defaultCreateOpts :: T.Text -> CreateOpts
747+defaultCreateOpts imageName = CreateOpts
685−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
687-- | Override the key sequence for detaching a container.
753-- | Override the key sequence for detaching a container.
688-- 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 _.
@@ -696,16 +762,45 @@ defaultStartOpts :: StartOpts
696defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
698-- | Options for deleting a container.
764-- | Options for deleting a container.
699−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
700 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
701 , force :: Bool -- ^ If the container is still running force deletion anyway.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
702 } 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
704-- | 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
705-- 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
706-- running.
794-- running.
707−defaultDeleteOpts :: DeleteOpts
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
708−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
710-- | Timestamp alias.
805-- | Timestamp alias.
711type Timestamp = Integer
806type Timestamp = Integer
@@ -733,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
733 , 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
736-- 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")
737-- | Set permissions on volumes that you mount in the container.
862-- | Set permissions on volumes that you mount in the container.
738data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
740instance ToJSON VolumePermission where
865instance ToJSON VolumePermission where
741 toJSON ReadWrite = "rw"
866 toJSON ReadWrite = "rw"
742− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
744instance FromJSON VolumePermission where
869instance FromJSON VolumePermission where
745 parseJSON "rw" = return ReadWrite
870 parseJSON "rw" = return ReadWrite
746 parseJSON "ro" = return ReadOnly
871 parseJSON "ro" = return ReadOnly
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
747− parseJSON _ = fail "Failed to parse VolumePermission"
874+ parseJSON _ = fail "Failed to parse VolumePermission"
749-- | Used for marking a directory in the container as "exposed" hence
876-- | Used for marking a directory in the container as "exposed" hence
750-- taking it outside of the COW filesystem and making it mountable
877-- taking it outside of the COW filesystem and making it mountable
@@ -759,15 +886,15 @@ instance FromJSON VolumePermission where
760newtype Volume = Volume FilePath deriving (Eq, Show)
887newtype Volume = Volume FilePath deriving (Eq, Show)
762−instance ToJSON [Volume] where
889+instance {-# OVERLAPPING #-} ToJSON [Volume] where
763 toJSON [] = emptyJsonObject
890 toJSON [] = emptyJsonObject
764 toJSON (v:vs) = toJsonKey (v:vs) getKey
891 toJSON (v:vs) = toJsonKey (v:vs) getKey
765 where getKey (Volume v) = v
892 where getKey (Volume v) = v
767−instance FromJSON [Volume] where
894+instance {-# OVERLAPPING #-} FromJSON [Volume] where
768 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
769− parseJSON (JSON.Null) = return []
896+ parseJSON (JSON.Null) = return []
770− parseJSON _ = fail "Volume is not an object"
897+ parseJSON _ = fail "Volume is not an object"
773data Bind = Bind { hostSrc :: Text
900data Bind = Bind { hostSrc :: Text
@@ -777,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
778instance FromJSON Bind where
905instance FromJSON Bind where
779 parseJSON (JSON.String t) = case T.split (== ':') t of
906 parseJSON (JSON.String t) = case T.split (== ':') t of
780− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
781 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
782 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
783− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
784 parseJSON _ = fail "Bind is not a string"
911 parseJSON _ = fail "Bind is not a string"
786data Device = Device {
913data Device = Device {
@@ -803,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
804instance FromJSON VolumeFrom where
931instance FromJSON VolumeFrom where
805 parseJSON (JSON.String t) = case T.split (== ':') t of
932 parseJSON (JSON.String t) = case T.split (== ':') t of
806− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
807 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
808 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
809− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
810 parseJSON _ = fail "VolumeFrom is not a string"
937 parseJSON _ = fail "VolumeFrom is not a string"
812instance ToJSON VolumeFrom where
939instance ToJSON VolumeFrom where
813 toJSON (VolumeFrom n p) = case p of
940 toJSON (VolumeFrom n p) = case p of
814− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
815 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
817instance ToJSON Bind where
944instance ToJSON Bind where
@@ -823,51 +950,51 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
824instance FromJSON Link where
951instance FromJSON Link where
825 parseJSON (JSON.String t) = case T.split (== ':') t of
952 parseJSON (JSON.String t) = case T.split (== ':') t of
826− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
827 [f,s] -> return $ Link f $ Just s
954 [f,s] -> return $ Link f $ Just s
828− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
829 parseJSON _ = fail "Link is not a string"
956 parseJSON _ = fail "Link is not a string"
831instance ToJSON Link where
958instance ToJSON Link where
832 toJSON (Link n1 n2) = toJSON $ case n2 of
959 toJSON (Link n1 n2) = toJSON $ case n2 of
833 Nothing -> T.concat[n1, ":", n1] -- use same name in container
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
834− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
836-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
837data 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)
839instance FromJSON LogDriverType where
966instance FromJSON LogDriverType where
840 parseJSON (JSON.String "json-file") = return JsonFile
967 parseJSON (JSON.String "json-file") = return JsonFile
841− parseJSON (JSON.String "syslog") = return Syslog
968+ parseJSON (JSON.String "syslog") = return Syslog
842− parseJSON (JSON.String "journald") = return Journald
969+ parseJSON (JSON.String "journald") = return Journald
843− parseJSON (JSON.String "gelf") = return Gelf
970+ parseJSON (JSON.String "gelf") = return Gelf
844− parseJSON (JSON.String "fluentd") = return Fluentd
971+ parseJSON (JSON.String "fluentd") = return Fluentd
845− parseJSON (JSON.String "awslogs") = return AwsLogs
972+ parseJSON (JSON.String "awslogs") = return AwsLogs
846− parseJSON (JSON.String "splunk") = return Splunk
973+ parseJSON (JSON.String "splunk") = return Splunk
847− parseJSON (JSON.String "etwlogs") = return Etwlogs
974+ parseJSON (JSON.String "etwlogs") = return Etwlogs
848− parseJSON (JSON.String "none") = return LoggingDisabled
975+ parseJSON (JSON.String "none") = return LoggingDisabled
849− parseJSON _ = fail "Unknown LogDriverType"
976+ parseJSON _ = fail "Unknown LogDriverType"
851instance ToJSON LogDriverType where
978instance ToJSON LogDriverType where
852− toJSON JsonFile = JSON.String "json-file"
979+ toJSON JsonFile = JSON.String "json-file"
853− toJSON Syslog = JSON.String "syslog"
980+ toJSON Syslog = JSON.String "syslog"
854− toJSON Journald = JSON.String "journald"
981+ toJSON Journald = JSON.String "journald"
855− toJSON Gelf = JSON.String "gelf"
982+ toJSON Gelf = JSON.String "gelf"
856− toJSON Fluentd = JSON.String "fluentd"
983+ toJSON Fluentd = JSON.String "fluentd"
857− toJSON AwsLogs = JSON.String "awslogs"
984+ toJSON AwsLogs = JSON.String "awslogs"
858− toJSON Splunk = JSON.String "splunk"
985+ toJSON Splunk = JSON.String "splunk"
859− toJSON Etwlogs = JSON.String "etwlogs"
986+ toJSON Etwlogs = JSON.String "etwlogs"
860 toJSON LoggingDisabled = JSON.String "none"
987 toJSON LoggingDisabled = JSON.String "none"
862data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
864−instance ToJSON [LogDriverOption] where
991+instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
865 toJSON [] = emptyJsonObject
992 toJSON [] = emptyJsonObject
866 toJSON (o:os) = toJsonKeyVal (o:os) key val
993 toJSON (o:os) = toJsonKeyVal (o:os) key val
867 where key (LogDriverOption n _) = T.unpack n
994 where key (LogDriverOption n _) = T.unpack n
868 val (LogDriverOption _ v) = v
995 val (LogDriverOption _ v) = v
870−instance FromJSON [LogDriverOption] where
997+instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
871 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
998 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
872 where f accM k v = do
999 where f accM k v = do
873 acc <- accM
1000 acc <- accM
@@ -890,19 +1017,41 @@ instance FromJSON LogDriverConfig where
890 parseJSON _ = fail "LogDriverConfig is not an object"
1017 parseJSON _ = fail "LogDriverConfig is not an object"
892-- TODO: Add container:<name|id> mode
1019-- TODO: Add container:<name|id> mode
893−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
894 deriving (Eq, Show, Ord)
1021 deriving (Eq, Show, Ord)
896instance FromJSON NetworkMode where
1023instance FromJSON NetworkMode where
897− parseJSON (JSON.String "bridge") = return Bridge
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
898− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
899− parseJSON (JSON.String "none") = return NetworkDisabled
1026+ parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
900− parseJSON _ = fail "Unknown NetworkMode"
1028+ parseJSON _ = fail "Unknown NetworkMode"
902instance ToJSON NetworkMode where
1030instance ToJSON NetworkMode where
903− toJSON Bridge = JSON.String "bridge"
1031+ toJSON NetworkBridge = JSON.String "bridge"
904− toJSON Host = JSON.String "host"
1032+ toJSON NetworkHost = JSON.String "host"
905 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]
907data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -918,7 +1067,7 @@ instance FromJSON PortType where
918 parseJSON val = case val of
1067 parseJSON val = case val of
919 "tcp" -> return TCP
1068 "tcp" -> return TCP
920 "udp" -> return UDP
1069 "udp" -> return UDP
921− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
923-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -999,7 +1148,7 @@ addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
999 oldeps = exposedPorts cc
1148 oldeps = exposedPorts cc
1002−instance FromJSON [PortBinding] where
1151+instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1003 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1152 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1005 f accM k v = case T.split (== '/') k of
1154 f accM k v = case T.split (== '/') k of
@@ -1013,7 +1162,7 @@ instance FromJSON [PortBinding] where
1013 parseJSON (JSON.Null) = return []
1162 parseJSON (JSON.Null) = return []
1014 parseJSON _ = fail "PortBindings is not an object"
1163 parseJSON _ = fail "PortBindings is not an object"
1016−instance ToJSON [PortBinding] where
1165+instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1017 toJSON [] = emptyJsonObject
1166 toJSON [] = emptyJsonObject
1018 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1167 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1019 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1168 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
@@ -1048,7 +1197,7 @@ instance FromJSON RestartPolicy where
1048 "on-failure" -> do
1197 "on-failure" -> do
1049 retry <- o .: "MaximumRetryCount"
1198 retry <- o .: "MaximumRetryCount"
1050 return $ RestartOnFailure retry
1199 return $ RestartOnFailure retry
1051− "off" -> return RestartOff
1200+ "no" -> return RestartOff
1052 _ -> fail "Could not parse RestartPolicy"
1201 _ -> fail "Could not parse RestartPolicy"
1053 parseJSON _ = fail "RestartPolicy is not an object"
1202 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1056,7 +1205,7 @@ instance ToJSON RestartPolicy where
1056 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1057 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1058 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1059− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
1061data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1229,6 +1378,22 @@ instance ToJSON DeviceRate where
1229 , "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"
1232data ContainerResources = ContainerResources {
1397data ContainerResources = ContainerResources {
1233 cpuShares :: Maybe Integer
1398 cpuShares :: Maybe Integer
1234 -- , 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.
@@ -1244,12 +1409,12 @@ data ContainerResources = ContainerResources {
1244 , cpusetMems :: Maybe Text
1409 , cpusetMems :: Maybe Text
1245 , devices :: [Device]
1410 , devices :: [Device]
1246 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1247− , kernelMemory :: Maybe Integer
1412+ , kernelMemory :: Maybe MemoryConstraint
1248− , memory :: Maybe Integer
1413+ , memory :: Maybe MemoryConstraint
1249− , memoryReservation :: Maybe Integer
1414+ , memoryReservation :: Maybe MemoryConstraint
1250− , memorySwap :: Maybe Integer
1415+ , memorySwap :: Maybe MemoryConstraint
1251 -- , 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.
1252− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
1253 -- , 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.
1254 , ulimits :: [Ulimit]
1419 , ulimits :: [Ulimit]
1255 -- TODO: Missing from 1.24
1420 -- TODO: Missing from 1.24
@@ -1287,7 +1452,7 @@ instance FromJSON EnvVar where
1287 parseJSON _ = fail "EnvVar is not a string"
1452 parseJSON _ = fail "EnvVar is not a string"
1289instance ToJSON EnvVar where
1454instance ToJSON EnvVar where
1290− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1292-- | ExposedPort represents a port (and it's type)
1457-- | ExposedPort represents a port (and it's type)
1293-- 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.
@@ -1308,7 +1473,7 @@ instance ToJSON EnvVar where
1309data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1474data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1311−instance FromJSON [ExposedPort] where
1476+instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1312 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1477 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1314 f accM k _ = case T.split (== '/') k of
1479 f accM k _ = case T.split (== '/') k of
@@ -1321,12 +1486,27 @@ instance FromJSON [ExposedPort] where
1321 parseJSON (JSON.Null) = return []
1486 parseJSON (JSON.Null) = return []
1322 parseJSON _ = fail "ExposedPorts is not an object"
1487 parseJSON _ = fail "ExposedPorts is not an object"
1324−instance ToJSON [ExposedPort] where
1489+instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1325 toJSON [] = emptyJsonObject
1490 toJSON [] = emptyJsonObject
1326 toJSON (p:ps) = toJsonKey (p:ps) key
1491 toJSON (p:ps) = toJsonKey (p:ps) key
1327 where key (ExposedPort p t) = show p <> slash <> show t
1492 where key (ExposedPort p t) = show p <> slash <> show t
1328 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"
1330data ContainerConfig = ContainerConfig {
1510data ContainerConfig = ContainerConfig {
1331 hostname :: Maybe Text
1511 hostname :: Maybe Text
1332 , domainname :: Maybe Text
1512 , domainname :: Maybe Text
@@ -1345,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
1345 , image :: Text
1525 , image :: Text
1346 , volumes :: [Volume]
1526 , volumes :: [Volume]
1347 , workingDir :: Maybe FilePath
1527 , workingDir :: Maybe FilePath
1348− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
1349 , 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?
1350 , macAddress :: Maybe Text
1530 , macAddress :: Maybe Text
1351 -- , 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.
@@ -1353,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
1353 , stopSignal :: Signal
1533 , stopSignal :: Signal
1354 } deriving (Eq, Show, Generic)
1534 } deriving (Eq, Show, Generic)
1356instance ToJSON ContainerConfig where
1537instance ToJSON ContainerConfig where
1357 toJSON = genericToJSON defaultOptions {
1538 toJSON = genericToJSON defaultOptions {
1358 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1365,9 +1546,7 @@ instance FromJSON ContainerConfig where
1365 attachStdin <- o .: "AttachStdin"
1546 attachStdin <- o .: "AttachStdin"
1366 attachStdout <- o .: "AttachStdout"
1547 attachStdout <- o .: "AttachStdout"
1367 attachStderr <- o .: "AttachStderr"
1548 attachStderr <- o .: "AttachStderr"
1368− exposedPorts <- case HM.lookup "ExposedPorts" o of
1549+ exposedPorts <- o .:? "ExposedPorts" .!= []
1369− Just eps -> parseJSON eps
1370− Nothing -> return []
1371 tty <- o .: "Tty"
1550 tty <- o .: "Tty"
1372 openStdin <- o .: "OpenStdin"
1551 openStdin <- o .: "OpenStdin"
1373 stdinOnce <- o .: "StdinOnce"
1552 stdinOnce <- o .: "StdinOnce"
@@ -1376,18 +1555,20 @@ instance FromJSON ContainerConfig where
1376 image <- o .: "Image"
1555 image <- o .: "Image"
1377 volumes <- o .: "Volumes"
1556 volumes <- o .: "Volumes"
1378 workingDir <- o .:? "WorkingDir"
1557 workingDir <- o .:? "WorkingDir"
1379− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
1380 networkDisabled <- o .:? "networkDisabled"
1559 networkDisabled <- o .:? "networkDisabled"
1381 macAddress <- o .:? "MacAddress"
1560 macAddress <- o .:? "MacAddress"
1382− labels <- case HM.lookup "Labels" o of
1561+ labels <- o .:? "Labels" .!= []
1383− Just ls -> parseJSON ls
1384− Nothing -> return []
1385 stopSignal <- o .: "StopSignal"
1562 stopSignal <- o .: "StopSignal"
1386 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
1387 macAddress labels stopSignal
1564 macAddress labels stopSignal
1388 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
1390parseIntegerText :: (Monad m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1391parseIntegerText t = case readMaybe $ T.unpack t of
1572parseIntegerText t = case readMaybe $ T.unpack t of
1392 Nothing ->
1573 Nothing ->
1393 fail "Could not parse Integer"
1574 fail "Could not parse Integer"
@@ -1409,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1409-- | Helper function that return an empty dictionary "{}"
1590-- | Helper function that return an empty dictionary "{}"
1410emptyJsonObject :: JSON.Value
1591emptyJsonObject :: JSON.Value
1411emptyJsonObject = JSON.Object HM.empty
1592emptyJsonObject = JSON.Object HM.empty