@@ -11,6 +11,9 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14+ , NetworkID
15+ , fromNetworkID
16+ , toNetworkID
1417 , Timeout(..)
1518 , StatusCode(..)
1619 , Signal(..)
@@ -23,7 +26,7 @@ module Docker.Client.Types (
2326 , ContainerPortInfo(..)
2427 , Container(..)
2528 , ContainerState(..)
26− , Status(..)
29+ , State(..)
2730 , Digest
2831 , Label(..)
2932 , Tag
@@ -37,12 +40,16 @@ module Docker.Client.Types (
3740 , DetachKeys(..)
3841 , StartOpts(..)
3942 , defaultStartOpts
40− , DeleteOpts(..)
41− , defaultDeleteOpts
43+ , ContainerDeleteOpts(..)
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
4247 , Timestamp
4348 , TailLogOpt(..)
4449 , LogOpts(..)
4550 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
4653 , VolumePermission(..)
4754 , Bind(..)
4855 , Volume(..)
@@ -68,6 +75,8 @@ module Docker.Client.Types (
6875 , UTSMode(..)
6976 , HostConfig(..)
7077 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
7180 , Ulimit(..)
7281 , ContainerResources(..)
7382 , defaultContainerResources
@@ -123,10 +132,13 @@ data Endpoint =
123132 | UnpauseContainerEndpoint ContainerID
124133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
125134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
126− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
127136 | InspectContainerEndpoint ContainerID
128137 | BuildImageEndpoint BuildOpts FilePath
129138 | 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
130142 deriving (Eq, Show)
131143
132144-- | We should newtype this
@@ -238,7 +250,7 @@ data ContainerDetails = ContainerDetails {
238250 , processLabel :: Text
239251 , resolveConfPath :: FilePath
240252 , restartCount :: Int
241− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
242254 , mounts :: [Mount]
243255 }
244256 deriving (Eq, Show, Generic)
@@ -281,7 +293,7 @@ data ContainerState = ContainerState {
281293 , restarting :: Bool
282294 , running :: Bool
283295 , startedAt :: UTCTime
284− , status :: Status
296+ , state :: State
285297 }
286298 deriving (Eq, Show, Generic)
287299
@@ -511,7 +523,8 @@ data Container = Container
511523 , containerImageId :: ImageID
512524 , containerCommand :: Text
513525 , containerCreatedAt :: Int
514− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
515528 , containerPorts :: [ContainerPortInfo]
516529 , containerLabels :: [Label]
517530 , containerNetworks :: [Network]
@@ -527,6 +540,7 @@ instance FromJSON Container where
527540 <*> (v .: "Command") -- Doesn't exist anymore
528541 <*> (v .: "Created")
529542 <*> (v .: "State")
543+ <*> (v .: "Status")
530544 <*> (v .: "Ports")
531545 <*> (v .: "Labels")
532546 <*> (v .: "NetworkSettings" >>= parseNetworks)
@@ -537,11 +551,11 @@ instance FromJSON Container where
537551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
538552 parseJSON _ = fail "Container: Not a JSON object."
539553
540−-- | Represents the status of the container life cycle.
541−data Status = ContainerStatus T.Text
554+-- | Represents the state of the container life cycle.
555+data State = Created | Restarting | Running | Paused | Exited | Dead
542556 deriving (Eq, Show, Generic)
543557
544−instance FromJSON Status where
558+instance FromJSON State where
545559 parseJSON (JSON.String "running") = return Running
546560 parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
547561 parseJSON (JSON.String "restarting") = return Restarting
@@ -609,20 +623,46 @@ instance FromJSON Image where
609623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
610624 parseJSON _ = fail "Failed to parse DockerImage."
611625
626+-- | Alias for Aliases.
627+type Alias = Text
628+
629+-- | EndpointsConfig is container configuration for a specific network
630+newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
631+
632+instance ToJSON EndpointConfig where
633+ toJSON (EndpointConfig aliases) = JSON.object
634+ [ "Aliases" .= aliases
635+ ]
636+
637+-- | Alias for endpoint name
638+type EndpointName = Text
639+
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)
644+
645+instance ToJSON NetworkingConfig where
646+ toJSON (NetworkingConfig endpointsConfig) = JSON.object
647+ [ "EndpointsConfig" .= endpointsConfig
648+ ]
612649
613650-- | Options used for creating a Container.
614651data CreateOpts = CreateOpts {
615− containerConfig :: ContainerConfig
616− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
617655 } deriving (Eq, Show)
618656
619657instance ToJSON CreateOpts where
620− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
621659 let ccJSON = toJSON cc
622660 let hcJSON = toJSON hc
623661 case ccJSON of
624662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
625− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665+ JSON.Object o2
626666 _ -> error "ContainerConfig is not an object." -- This should never happen.
627667
628668-- | Container configuration used for creating a container with sensible
@@ -657,7 +697,7 @@ defaultHostConfig = HostConfig {
657697 binds=[]
658698 , containerIDFile=Nothing
659699 , logConfig=LogDriverConfig JsonFile []
660− , networkMode=Bridge
700+ , networkMode=NetworkBridge
661701 , portBindings=[]
662702 , restartPolicy=RestartOff
663703 , volumeDriver=Nothing
@@ -704,7 +744,11 @@ defaultContainerResources = ContainerResources {
704744-- | Default create options when creating a container. You only need to
705745-- specify an image name and the rest is all sensible defaults.
706746defaultCreateOpts :: T.Text -> CreateOpts
707−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
747+defaultCreateOpts imageName = CreateOpts
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
751+ }
708752
709753-- | Override the key sequence for detaching a container.
710754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -718,7 +762,7 @@ defaultStartOpts :: StartOpts
718762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
719763
720764-- | Options for deleting a container.
721−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
722766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
723767 , force :: Bool -- ^ If the container is still running force deletion anyway.
724768 } deriving (Eq, Show)
@@ -748,8 +792,15 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
748792-- | Default options for deleting a container. Most of the time we DON'T
749793-- want to delete the container's volumes or force delete it if it's
750794-- running.
751−defaultDeleteOpts :: DeleteOpts
752−defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
796+defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
797+
798+-- | Image delete opts
799+data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
800+
801+-- | Sane image deletion defaults
802+defaultImageDeleteOpts :: ImageDeleteOpts
803+defaultImageDeleteOpts = ImageDeleteOpts
753804
754805-- | Timestamp alias.
755806type Timestamp = Integer
@@ -777,6 +828,36 @@ defaultLogOpts = LogOpts { stdout = True
777828 , tail = All
778829 }
779830
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)
839+
840+-- | Sensible defalut for create network options
841+defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842+defaultCreateNetworkOpts name =
843+ CreateNetworkOpts
844+ { createNetworkName = name
845+ , createNetworkCheckDuplicate = False
846+ , createNetworkDriver = "bridge"
847+ , createNetworkInternal = True
848+ , createNetworkEnableIPv6 = False
849+ }
850+
851+instance ToJSON CreateNetworkOpts where
852+ toJSON opts =
853+ object
854+ [ "Name" .= createNetworkName opts
855+ , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856+ , "Driver" .= createNetworkDriver opts
857+ , "Internal" .= createNetworkInternal opts
858+ , "EnableIPv6" .= createNetworkEnableIPv6 opts
859+ ]
860+
780861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
781862-- | Set permissions on volumes that you mount in the container.
782863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -936,19 +1017,41 @@ instance FromJSON LogDriverConfig where
9361017 parseJSON _ = fail "LogDriverConfig is not an object"
9371018
9381019-- TODO: Add container:<name|id> mode
939−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
9401021 deriving (Eq, Show, Ord)
9411022
9421023instance FromJSON NetworkMode where
943− parseJSON (JSON.String "bridge") = return Bridge
944− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
9451026 parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
9461028 parseJSON _ = fail "Unknown NetworkMode"
9471029
9481030instance ToJSON NetworkMode where
949− toJSON Bridge = JSON.String "bridge"
950− toJSON Host = JSON.String "host"
951− toJSON NetworkDisabled = JSON.String "none"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
1033+ toJSON NetworkDisabled = JSON.String "none"
1034+ toJSON (NetworkNamed n) = JSON.String n
1035+
1036+newtype NetworkID = NetworkID Text
1037+ deriving (Eq, Show)
1038+
1039+-- | Used for extracting the id of the container from the newtype
1040+fromNetworkID :: NetworkID -> Text
1041+fromNetworkID (NetworkID t) = t
1042+
1043+-- | Used for parsing a Text value into a NetworkID.
1044+toNetworkID :: Text -> Maybe NetworkID
1045+toNetworkID t = Just $ NetworkID t
1046+
1047+instance FromJSON NetworkID where
1048+ parseJSON (JSON.Object o) = do
1049+ nid <- o .: "Id"
1050+ return $ NetworkID nid
1051+ parseJSON _ = fail "NetworkID is not an object."
1052+
1053+instance ToJSON NetworkID where
1054+ toJSON (NetworkID nid) = object ["Id" .= nid]
9521055
9531056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9541057
@@ -1349,7 +1452,7 @@ instance FromJSON EnvVar where
13491452 parseJSON _ = fail "EnvVar is not a string"
13501453
13511454instance ToJSON EnvVar where
1352− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
13531456
13541457-- | ExposedPort represents a port (and it's type)
13551458-- that a container should expose to other containers or the host system.
@@ -1461,7 +1564,11 @@ instance FromJSON ContainerConfig where
14611564 macAddress labels stopSignal
14621565 parseJSON _ = fail "NetworkSettings is not an object."
14631566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
14641570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
14651572parseIntegerText t = case readMaybe $ T.unpack t of
14661573 Nothing ->
14671574 fail "Could not parse Integer"