@@ -11,6 +11,9 @@ module Docker.Client.Types (
12 , fromImageID
12 , fromImageID
13 , toImageID
13 , toImageID
14 , Timeout(..)
17 , Timeout(..)
15 , StatusCode(..)
18 , StatusCode(..)
16 , Signal(..)
19 , Signal(..)
@@ -23,23 +26,30 @@ module Docker.Client.Types (
23 , ContainerPortInfo(..)
26 , ContainerPortInfo(..)
24 , Container(..)
27 , Container(..)
25 , ContainerState(..)
28 , ContainerState(..)
26− , Status(..)
29+ , State(..)
28 , Label(..)
31 , Label(..)
30 , Image(..)
33 , Image(..)
31 , dropImagePrefix
35 , dropImagePrefix
32 , CreateOpts(..)
36 , CreateOpts(..)
33 , defaultCreateOpts
39 , defaultCreateOpts
34 , DetachKeys(..)
40 , DetachKeys(..)
35 , StartOpts(..)
41 , StartOpts(..)
36 , defaultStartOpts
42 , defaultStartOpts
37− , DeleteOpts(..)
43+ , ContainerDeleteOpts(..)
38− , defaultDeleteOpts
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
39 , Timestamp
47 , Timestamp
40 , TailLogOpt(..)
48 , TailLogOpt(..)
41 , LogOpts(..)
49 , LogOpts(..)
42 , defaultLogOpts
50 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
43 , VolumePermission(..)
53 , VolumePermission(..)
44 , Bind(..)
54 , Bind(..)
45 , Volume(..)
55 , Volume(..)
@@ -65,6 +75,8 @@ module Docker.Client.Types (
65 , UTSMode(..)
75 , UTSMode(..)
66 , HostConfig(..)
76 , HostConfig(..)
67 , defaultHostConfig
77 , defaultHostConfig
78+ , NetworkingConfig(..)
68 , Ulimit(..)
80 , Ulimit(..)
69 , ContainerResources(..)
81 , ContainerResources(..)
70 , defaultContainerResources
82 , defaultContainerResources
@@ -100,6 +112,7 @@ import Data.Scientific (floatingOrInteger)
100import Data.Text (Text)
112import Data.Text (Text)
101import qualified Data.Text as T
113import qualified Data.Text as T
102import Data.Time.Clock (UTCTime)
114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
103import GHC.Generics (Generic)
116import GHC.Generics (Generic)
104import Prelude hiding (all, tail)
117import Prelude hiding (all, tail)
105import Text.Read (readMaybe)
118import Text.Read (readMaybe)
@@ -119,8 +132,13 @@ data Endpoint =
119 | UnpauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
120 | 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.
121 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
122− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
123 | 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
124 deriving (Eq, Show)
142 deriving (Eq, Show)
126-- | We should newtype this
144-- | We should newtype this
@@ -195,16 +213,16 @@ data Signal = SIGHUP
196instance FromJSON Signal where
214instance FromJSON Signal where
197 parseJSON (JSON.String "SIGTERM") = return SIGTERM
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
198− 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.
199− parseJSON (JSON.String "SIGINT") = return SIGINT
217+ parseJSON (JSON.String "SIGINT") = return SIGINT
200 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
201 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
202 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
203− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
205instance ToJSON Signal where
223instance ToJSON Signal where
206− toJSON SIGHUP = "SIGHUP"
224+ toJSON SIGHUP = "SIGHUP"
207− toJSON SIGINT = "SIGINT"
225+ toJSON SIGINT = "SIGINT"
208 toJSON SIGQUIT = "SIGQUIT"
226 toJSON SIGQUIT = "SIGQUIT"
209 toJSON SIGSTOP = "SIGSTOP"
227 toJSON SIGSTOP = "SIGSTOP"
210 toJSON SIGTERM = "SIGTERM"
228 toJSON SIGTERM = "SIGTERM"
@@ -232,7 +250,7 @@ data ContainerDetails = ContainerDetails {
232 , processLabel :: Text
250 , processLabel :: Text
233 , resolveConfPath :: FilePath
251 , resolveConfPath :: FilePath
234 , restartCount :: Int
252 , restartCount :: Int
235− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
236 , mounts :: [Mount]
254 , mounts :: [Mount]
238 deriving (Eq, Show, Generic)
256 deriving (Eq, Show, Generic)
@@ -240,11 +258,11 @@ data ContainerDetails = ContainerDetails {
240-- | Data type used for parsing the mount information from a container
258-- | Data type used for parsing the mount information from a container
242data Mount = Mount {
260data Mount = Mount {
243− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
244 , mountSource :: FilePath
262 , mountSource :: FilePath
245 , mountDestination :: FilePath
263 , mountDestination :: FilePath
246− , mountDriver :: Text
264+ , mountDriver :: Maybe Text
247− , mountMode :: Maybe VolumePermission -- apparently this can be null
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
248 , mountRW :: Bool
266 , mountRW :: Bool
249 , mountPropogation :: Text
267 , mountPropogation :: Text
@@ -252,14 +270,14 @@ data Mount = Mount {
253instance FromJSON Mount where
271instance FromJSON Mount where
254 parseJSON (JSON.Object o) = do
272 parseJSON (JSON.Object o) = do
255− name <- o .: "Name"
273+ name <- o .:? "Name"
256 src <- o .: "Source"
274 src <- o .: "Source"
257 dest <- o .: "Destination"
275 dest <- o .: "Destination"
258− driver <- o .: "Driver"
276+ driver <- o .:? "Driver"
259− mode <- o .: "Mode"
277+ -- mode <- o .: "Mode"
260 rw <- o .: "RW"
278 rw <- o .: "RW"
261 prop <- o .: "Propagation"
279 prop <- o .: "Propagation"
262− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
263 parseJSON _ = fail "Mount is not an object"
281 parseJSON _ = fail "Mount is not an object"
265-- | 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
@@ -275,7 +293,7 @@ data ContainerState = ContainerState {
275 , restarting :: Bool
293 , restarting :: Bool
276 , running :: Bool
294 , running :: Bool
277 , startedAt :: UTCTime
295 , startedAt :: UTCTime
278− , status :: Status
296+ , state :: State
280 deriving (Eq, Show, Generic)
298 deriving (Eq, Show, Generic)
@@ -505,7 +523,8 @@ data Container = Container
505 , containerImageId :: ImageID
523 , containerImageId :: ImageID
506 , containerCommand :: Text
524 , containerCommand :: Text
507 , containerCreatedAt :: Int
525 , containerCreatedAt :: Int
526+ , containerState :: State
508− , containerStatus :: Status
527+ , containerStatus :: Maybe Text
509 , containerPorts :: [ContainerPortInfo]
528 , containerPorts :: [ContainerPortInfo]
510 , containerLabels :: [Label]
529 , containerLabels :: [Label]
511 , containerNetworks :: [Network]
530 , containerNetworks :: [Network]
@@ -513,13 +532,14 @@ data Container = Container
513 } deriving (Show, Eq)
532 } deriving (Show, Eq)
515instance FromJSON Container where
534instance FromJSON Container where
516− parseJSON (JSON.Object v) =
535+ parseJSON o@(JSON.Object v) =
517− Container <$> (v .: "Id")
536+ Container <$> parseJSON o
518 <*> (v .: "Names")
537 <*> (v .: "Names")
519 <*> (v .: "Image")
538 <*> (v .: "Image")
520− <*> (v .: "ImageID")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
521− <*> (v .: "Command")
540+ <*> (v .: "Command") -- Doesn't exist anymore
522 <*> (v .: "Created")
541 <*> (v .: "Created")
523 <*> (v .: "Status")
543 <*> (v .: "Status")
524 <*> (v .: "Ports")
544 <*> (v .: "Ports")
525 <*> (v .: "Labels")
545 <*> (v .: "Labels")
@@ -529,21 +549,20 @@ instance FromJSON Container where
529 parseNetworks (JSON.Object v) =
549 parseNetworks (JSON.Object v) =
530 (v .: "Networks") >>= parseJSON
550 (v .: "Networks") >>= parseJSON
531 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
533 parseJSON _ = fail "Container: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
535−-- | Represents the status of the container life cycle.
554+-- | Represents the state of the container life cycle.
536−data Status = Created | Restarting | Running | Paused | Exited | Dead
555+data State = Created | Restarting | Running | Paused | Exited | Dead
537 deriving (Eq, Show, Generic)
556 deriving (Eq, Show, Generic)
539−instance FromJSON Status where
558+instance FromJSON State where
540− parseJSON (JSON.String "running") = return Running
559+ parseJSON (JSON.String "running") = return Running
541− 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.
542 parseJSON (JSON.String "restarting") = return Restarting
561 parseJSON (JSON.String "restarting") = return Restarting
543− parseJSON (JSON.String "paused") = return Paused
562+ parseJSON (JSON.String "paused") = return Paused
544− parseJSON (JSON.String "exited") = return Exited
563+ parseJSON (JSON.String "exited") = return Exited
545− parseJSON (JSON.String "dead") = return Dead
564+ parseJSON (JSON.String "dead") = return Dead
546− parseJSON _ = fail "Unknown Status"
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
548-- | Alias for representing a RepoDigest. We could newtype this and add
567-- | Alias for representing a RepoDigest. We could newtype this and add
549-- some validation.
568-- some validation.
@@ -604,20 +623,46 @@ instance FromJSON Image where
604 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
605 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
608-- | Options used for creating a Container.
650-- | Options used for creating a Container.
609data CreateOpts = CreateOpts {
651data CreateOpts = CreateOpts {
610− containerConfig :: ContainerConfig
652+ containerConfig :: ContainerConfig
611− , hostConfig :: HostConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
612 } deriving (Eq, Show)
655 } deriving (Eq, Show)
614instance ToJSON CreateOpts where
657instance ToJSON CreateOpts where
615− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
616 let ccJSON = toJSON cc
659 let ccJSON = toJSON cc
617 let hcJSON = toJSON hc
660 let hcJSON = toJSON hc
618 case ccJSON of
661 case ccJSON of
619 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
620− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
621 _ -> error "ContainerConfig is not an object." -- This should never happen.
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
623-- | Container configuration used for creating a container with sensible
668-- | Container configuration used for creating a container with sensible
@@ -639,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
640 , volumes=[]
685 , volumes=[]
641 , workingDir=Nothing
686 , workingDir=Nothing
642− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
643 , networkDisabled=Nothing
688 , networkDisabled=Nothing
644 , macAddress=Nothing
689 , macAddress=Nothing
645 , labels=[]
690 , labels=[]
@@ -652,7 +697,7 @@ defaultHostConfig = HostConfig {
653 , containerIDFile=Nothing
698 , containerIDFile=Nothing
654 , logConfig=LogDriverConfig JsonFile []
699 , logConfig=LogDriverConfig JsonFile []
655− , networkMode=Bridge
700+ , networkMode=NetworkBridge
656 , portBindings=[]
701 , portBindings=[]
657 , restartPolicy=RestartOff
702 , restartPolicy=RestartOff
658 , volumeDriver=Nothing
703 , volumeDriver=Nothing
@@ -692,14 +737,18 @@ defaultContainerResources = ContainerResources {
692 , memory=Nothing
737 , memory=Nothing
693 , memoryReservation=Nothing
738 , memoryReservation=Nothing
694 , memorySwap=Nothing
739 , memorySwap=Nothing
695− , oomKillDisable=False
740+ , oomKillDisable=Just False
696 , ulimits=[]
741 , ulimits=[]
699-- | Default create options when creating a container. You only need to
744-- | Default create options when creating a container. You only need to
700-- specify an image name and the rest is all sensible defaults.
745-- specify an image name and the rest is all sensible defaults.
701defaultCreateOpts :: T.Text -> CreateOpts
746defaultCreateOpts :: T.Text -> CreateOpts
747+defaultCreateOpts imageName = CreateOpts
702−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
704-- | Override the key sequence for detaching a container.
753-- | Override the key sequence for detaching a container.
705-- 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 _.
@@ -713,16 +762,45 @@ defaultStartOpts :: StartOpts
713defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
715-- | Options for deleting a container.
764-- | Options for deleting a container.
716−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
717 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
718 , force :: Bool -- ^ If the container is still running force deletion anyway.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
719 } 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
721-- | 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
722-- 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
723-- running.
794-- running.
724−defaultDeleteOpts :: DeleteOpts
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
725−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
727-- | Timestamp alias.
805-- | Timestamp alias.
728type Timestamp = Integer
806type Timestamp = Integer
@@ -750,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
750 , 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
753-- 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")
754-- | Set permissions on volumes that you mount in the container.
862-- | Set permissions on volumes that you mount in the container.
755data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
757instance ToJSON VolumePermission where
865instance ToJSON VolumePermission where
758 toJSON ReadWrite = "rw"
866 toJSON ReadWrite = "rw"
759− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
761instance FromJSON VolumePermission where
869instance FromJSON VolumePermission where
762 parseJSON "rw" = return ReadWrite
870 parseJSON "rw" = return ReadWrite
763 parseJSON "ro" = return ReadOnly
871 parseJSON "ro" = return ReadOnly
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
764− parseJSON _ = fail "Failed to parse VolumePermission"
874+ parseJSON _ = fail "Failed to parse VolumePermission"
766-- | Used for marking a directory in the container as "exposed" hence
876-- | Used for marking a directory in the container as "exposed" hence
767-- taking it outside of the COW filesystem and making it mountable
877-- taking it outside of the COW filesystem and making it mountable
@@ -783,8 +893,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
784instance {-# OVERLAPPING #-} FromJSON [Volume] where
894instance {-# OVERLAPPING #-} FromJSON [Volume] where
785 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
786− parseJSON (JSON.Null) = return []
896+ parseJSON (JSON.Null) = return []
787− parseJSON _ = fail "Volume is not an object"
897+ parseJSON _ = fail "Volume is not an object"
790data Bind = Bind { hostSrc :: Text
900data Bind = Bind { hostSrc :: Text
@@ -794,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
795instance FromJSON Bind where
905instance FromJSON Bind where
796 parseJSON (JSON.String t) = case T.split (== ':') t of
906 parseJSON (JSON.String t) = case T.split (== ':') t of
797− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
798 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
799 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
800− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
801 parseJSON _ = fail "Bind is not a string"
911 parseJSON _ = fail "Bind is not a string"
803data Device = Device {
913data Device = Device {
@@ -820,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
821instance FromJSON VolumeFrom where
931instance FromJSON VolumeFrom where
822 parseJSON (JSON.String t) = case T.split (== ':') t of
932 parseJSON (JSON.String t) = case T.split (== ':') t of
823− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
824 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
825 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
826− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
827 parseJSON _ = fail "VolumeFrom is not a string"
937 parseJSON _ = fail "VolumeFrom is not a string"
829instance ToJSON VolumeFrom where
939instance ToJSON VolumeFrom where
830 toJSON (VolumeFrom n p) = case p of
940 toJSON (VolumeFrom n p) = case p of
831− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
832 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
834instance ToJSON Bind where
944instance ToJSON Bind where
@@ -840,40 +950,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
841instance FromJSON Link where
951instance FromJSON Link where
842 parseJSON (JSON.String t) = case T.split (== ':') t of
952 parseJSON (JSON.String t) = case T.split (== ':') t of
843− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
844 [f,s] -> return $ Link f $ Just s
954 [f,s] -> return $ Link f $ Just s
845− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
846 parseJSON _ = fail "Link is not a string"
956 parseJSON _ = fail "Link is not a string"
848instance ToJSON Link where
958instance ToJSON Link where
849 toJSON (Link n1 n2) = toJSON $ case n2 of
959 toJSON (Link n1 n2) = toJSON $ case n2 of
850 Nothing -> T.concat[n1, ":", n1] -- use same name in container
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
851− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
853-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
854data 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)
856instance FromJSON LogDriverType where
966instance FromJSON LogDriverType where
857 parseJSON (JSON.String "json-file") = return JsonFile
967 parseJSON (JSON.String "json-file") = return JsonFile
858− parseJSON (JSON.String "syslog") = return Syslog
968+ parseJSON (JSON.String "syslog") = return Syslog
859− parseJSON (JSON.String "journald") = return Journald
969+ parseJSON (JSON.String "journald") = return Journald
860− parseJSON (JSON.String "gelf") = return Gelf
970+ parseJSON (JSON.String "gelf") = return Gelf
861− parseJSON (JSON.String "fluentd") = return Fluentd
971+ parseJSON (JSON.String "fluentd") = return Fluentd
862− parseJSON (JSON.String "awslogs") = return AwsLogs
972+ parseJSON (JSON.String "awslogs") = return AwsLogs
863− parseJSON (JSON.String "splunk") = return Splunk
973+ parseJSON (JSON.String "splunk") = return Splunk
864− parseJSON (JSON.String "etwlogs") = return Etwlogs
974+ parseJSON (JSON.String "etwlogs") = return Etwlogs
865− parseJSON (JSON.String "none") = return LoggingDisabled
975+ parseJSON (JSON.String "none") = return LoggingDisabled
866− parseJSON _ = fail "Unknown LogDriverType"
976+ parseJSON _ = fail "Unknown LogDriverType"
868instance ToJSON LogDriverType where
978instance ToJSON LogDriverType where
869− toJSON JsonFile = JSON.String "json-file"
979+ toJSON JsonFile = JSON.String "json-file"
870− toJSON Syslog = JSON.String "syslog"
980+ toJSON Syslog = JSON.String "syslog"
871− toJSON Journald = JSON.String "journald"
981+ toJSON Journald = JSON.String "journald"
872− toJSON Gelf = JSON.String "gelf"
982+ toJSON Gelf = JSON.String "gelf"
873− toJSON Fluentd = JSON.String "fluentd"
983+ toJSON Fluentd = JSON.String "fluentd"
874− toJSON AwsLogs = JSON.String "awslogs"
984+ toJSON AwsLogs = JSON.String "awslogs"
875− toJSON Splunk = JSON.String "splunk"
985+ toJSON Splunk = JSON.String "splunk"
876− toJSON Etwlogs = JSON.String "etwlogs"
986+ toJSON Etwlogs = JSON.String "etwlogs"
877 toJSON LoggingDisabled = JSON.String "none"
987 toJSON LoggingDisabled = JSON.String "none"
879data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -907,19 +1017,41 @@ instance FromJSON LogDriverConfig where
907 parseJSON _ = fail "LogDriverConfig is not an object"
1017 parseJSON _ = fail "LogDriverConfig is not an object"
909-- TODO: Add container:<name|id> mode
1019-- TODO: Add container:<name|id> mode
910−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
911 deriving (Eq, Show, Ord)
1021 deriving (Eq, Show, Ord)
913instance FromJSON NetworkMode where
1023instance FromJSON NetworkMode where
914− parseJSON (JSON.String "bridge") = return Bridge
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
915− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
916− parseJSON (JSON.String "none") = return NetworkDisabled
1026+ parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
917− parseJSON _ = fail "Unknown NetworkMode"
1028+ parseJSON _ = fail "Unknown NetworkMode"
919instance ToJSON NetworkMode where
1030instance ToJSON NetworkMode where
920− toJSON Bridge = JSON.String "bridge"
1031+ toJSON NetworkBridge = JSON.String "bridge"
921− toJSON Host = JSON.String "host"
1032+ toJSON NetworkHost = JSON.String "host"
922 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]
924data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -935,7 +1067,7 @@ instance FromJSON PortType where
935 parseJSON val = case val of
1067 parseJSON val = case val of
936 "tcp" -> return TCP
1068 "tcp" -> return TCP
937 "udp" -> return UDP
1069 "udp" -> return UDP
938− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
940-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1065,7 +1197,7 @@ instance FromJSON RestartPolicy where
1065 "on-failure" -> do
1197 "on-failure" -> do
1066 retry <- o .: "MaximumRetryCount"
1198 retry <- o .: "MaximumRetryCount"
1067 return $ RestartOnFailure retry
1199 return $ RestartOnFailure retry
1068− "off" -> return RestartOff
1200+ "no" -> return RestartOff
1069 _ -> fail "Could not parse RestartPolicy"
1201 _ -> fail "Could not parse RestartPolicy"
1070 parseJSON _ = fail "RestartPolicy is not an object"
1202 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1073,7 +1205,7 @@ instance ToJSON RestartPolicy where
1073 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1074 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1075 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1076− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
1078data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1251,7 +1383,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1251data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1383data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1253instance ToJSON MemoryConstraint where
1385instance ToJSON MemoryConstraint where
1254− toJSON (MemoryConstraint x B) = toJSON x
1386+ toJSON (MemoryConstraint x B) = toJSON x
1255 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1387 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1256 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1388 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
@@ -1282,7 +1414,7 @@ data ContainerResources = ContainerResources {
1282 , memoryReservation :: Maybe MemoryConstraint
1414 , memoryReservation :: Maybe MemoryConstraint
1283 , memorySwap :: Maybe MemoryConstraint
1415 , memorySwap :: Maybe MemoryConstraint
1284 -- , 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.
1285− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
1286 -- , 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.
1287 , ulimits :: [Ulimit]
1419 , ulimits :: [Ulimit]
1288 -- TODO: Missing from 1.24
1420 -- TODO: Missing from 1.24
@@ -1320,7 +1452,7 @@ instance FromJSON EnvVar where
1320 parseJSON _ = fail "EnvVar is not a string"
1452 parseJSON _ = fail "EnvVar is not a string"
1322instance ToJSON EnvVar where
1454instance ToJSON EnvVar where
1323− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1325-- | ExposedPort represents a port (and it's type)
1457-- | ExposedPort represents a port (and it's type)
1326-- 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.
@@ -1360,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1360 where key (ExposedPort p t) = show p <> slash <> show t
1492 where key (ExposedPort p t) = show p <> slash <> show t
1361 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"
1363data ContainerConfig = ContainerConfig {
1510data ContainerConfig = ContainerConfig {
1364 hostname :: Maybe Text
1511 hostname :: Maybe Text
1365 , domainname :: Maybe Text
1512 , domainname :: Maybe Text
@@ -1378,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
1378 , image :: Text
1525 , image :: Text
1379 , volumes :: [Volume]
1526 , volumes :: [Volume]
1380 , workingDir :: Maybe FilePath
1527 , workingDir :: Maybe FilePath
1381− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
1382 , 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?
1383 , macAddress :: Maybe Text
1530 , macAddress :: Maybe Text
1384 -- , 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.
@@ -1386,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
1386 , stopSignal :: Signal
1533 , stopSignal :: Signal
1387 } deriving (Eq, Show, Generic)
1534 } deriving (Eq, Show, Generic)
1389instance ToJSON ContainerConfig where
1537instance ToJSON ContainerConfig where
1390 toJSON = genericToJSON defaultOptions {
1538 toJSON = genericToJSON defaultOptions {
1391 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1407,7 +1555,7 @@ instance FromJSON ContainerConfig where
1407 image <- o .: "Image"
1555 image <- o .: "Image"
1408 volumes <- o .: "Volumes"
1556 volumes <- o .: "Volumes"
1409 workingDir <- o .:? "WorkingDir"
1557 workingDir <- o .:? "WorkingDir"
1410− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
1411 networkDisabled <- o .:? "networkDisabled"
1559 networkDisabled <- o .:? "networkDisabled"
1412 macAddress <- o .:? "MacAddress"
1560 macAddress <- o .:? "MacAddress"
1413 labels <- o .:? "Labels" .!= []
1561 labels <- o .:? "Labels" .!= []
@@ -1416,7 +1564,11 @@ instance FromJSON ContainerConfig where
1416 macAddress labels stopSignal
1564 macAddress labels stopSignal
1417 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
1419parseIntegerText :: (Monad m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1420parseIntegerText t = case readMaybe $ T.unpack t of
1572parseIntegerText t = case readMaybe $ T.unpack t of
1421 Nothing ->
1573 Nothing ->
1422 fail "Could not parse Integer"
1574 fail "Could not parse Integer"
@@ -1438,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1438-- | Helper function that return an empty dictionary "{}"
1590-- | Helper function that return an empty dictionary "{}"
1439emptyJsonObject :: JSON.Value
1591emptyJsonObject :: JSON.Value
1440emptyJsonObject = JSON.Object HM.empty
1592emptyJsonObject = JSON.Object HM.empty