@@ -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(..)
@@ -43,6 +46,8 @@ module Docker.Client.Types (
4346 , TailLogOpt(..)
4447 , LogOpts(..)
4548 , defaultLogOpts
49+ , CreateNetworkOpts(..)
50+ , defaultCreateNetworkOpts
4651 , VolumePermission(..)
4752 , Bind(..)
4853 , Volume(..)
@@ -68,6 +73,8 @@ module Docker.Client.Types (
6873 , UTSMode(..)
6974 , HostConfig(..)
7075 , defaultHostConfig
76+ , NetworkingConfig(..)
77+ , EndpointConfig(..)
7178 , Ulimit(..)
7279 , ContainerResources(..)
7380 , defaultContainerResources
@@ -127,6 +134,8 @@ data Endpoint =
127134 | InspectContainerEndpoint ContainerID
128135 | BuildImageEndpoint BuildOpts FilePath
129136 | CreateImageEndpoint T.Text Tag (Maybe T.Text) -- ^ Either pull an image from docker hub or imports an image from a tarball (or URL)
137+ | CreateNetworkEndpoint CreateNetworkOpts
138+ | RemoveNetworkEndpoint NetworkID
130139 deriving (Eq, Show)
131140
132141-- | We should newtype this
@@ -611,20 +620,46 @@ instance FromJSON Image where
611620 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
612621 parseJSON _ = fail "Failed to parse DockerImage."
613622
623+-- | Alias for Aliases.
624+type Alias = Text
625+
626+-- | EndpointsConfig is container configuration for a specific network
627+newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
628+
629+instance ToJSON EndpointConfig where
630+ toJSON (EndpointConfig aliases) = JSON.object
631+ [ "Aliases" .= aliases
632+ ]
633+
634+-- | Alias for endpoint name
635+type EndpointName = Text
636+
637+-- | Data type for the NetworkingConfig section of the container settings
638+newtype NetworkingConfig = NetworkingConfig
639+ { endpointsConfig :: HM.HashMap EndpointName EndpointConfig
640+ } deriving (Eq, Show)
641+
642+instance ToJSON NetworkingConfig where
643+ toJSON (NetworkingConfig endpointsConfig) = JSON.object
644+ [ "EndpointsConfig" .= endpointsConfig
645+ ]
614646
615647-- | Options used for creating a Container.
616648data CreateOpts = CreateOpts {
617− containerConfig :: ContainerConfig
618− , hostConfig :: HostConfig
649+ containerConfig :: ContainerConfig
650+ , hostConfig :: HostConfig
651+ , networkingConfig :: NetworkingConfig
619652 } deriving (Eq, Show)
620653
621654instance ToJSON CreateOpts where
622− toJSON (CreateOpts cc hc) = do
655+ toJSON (CreateOpts cc hc nc) = do
623656 let ccJSON = toJSON cc
624657 let hcJSON = toJSON hc
625658 case ccJSON of
626659 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
627− JSON.Object $ HM.insert "HostConfig" hcJSON o
660+ let o1 = HM.insert "HostConfig" hcJSON o
661+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
662+ JSON.Object o2
628663 _ -> error "ContainerConfig is not an object." -- This should never happen.
629664
630665-- | Container configuration used for creating a container with sensible
@@ -706,7 +741,11 @@ defaultContainerResources = ContainerResources {
706741-- | Default create options when creating a container. You only need to
707742-- specify an image name and the rest is all sensible defaults.
708743defaultCreateOpts :: T.Text -> CreateOpts
709−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
744+defaultCreateOpts imageName = CreateOpts
745+ { containerConfig = defaultContainerConfig imageName
746+ , hostConfig = defaultHostConfig
747+ , networkingConfig = NetworkingConfig HM.empty
748+ }
710749
711750-- | Override the key sequence for detaching a container.
712751-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -779,6 +818,36 @@ defaultLogOpts = LogOpts { stdout = True
779818 , tail = All
780819 }
781820
821+-- | Options for creating a network
822+data CreateNetworkOpts = CreateNetworkOpts
823+ { createNetworkName :: Text -- ^ The network's name
824+ , createNetworkCheckDuplicate :: Bool -- ^ Check for networks with duplicate names.
825+ , createNetworkDriver :: Text -- ^ Name of the network driver plugin to use.
826+ , createNetworkInternal :: Bool -- ^ Restrict external access to the network.
827+ , createNetworkEnableIPv6 :: Bool -- ^ Enable IPv6 on the network.
828+ } deriving (Eq, Show)
829+
830+-- | Sensible defalut for create network options
831+defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
832+defaultCreateNetworkOpts name =
833+ CreateNetworkOpts
834+ { createNetworkName = name
835+ , createNetworkCheckDuplicate = False
836+ , createNetworkDriver = "bridge"
837+ , createNetworkInternal = True
838+ , createNetworkEnableIPv6 = False
839+ }
840+
841+instance ToJSON CreateNetworkOpts where
842+ toJSON opts =
843+ object
844+ [ "Name" .= createNetworkName opts
845+ , "CheckDuplicate" .= createNetworkCheckDuplicate opts
846+ , "Driver" .= createNetworkDriver opts
847+ , "Internal" .= createNetworkInternal opts
848+ , "EnableIPv6" .= createNetworkEnableIPv6 opts
849+ ]
850+
782851-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
783852-- | Set permissions on volumes that you mount in the container.
784853data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -954,6 +1023,26 @@ instance ToJSON NetworkMode where
9541023 toJSON NetworkDisabled = JSON.String "none"
9551024 toJSON (NetworkNamed n) = JSON.String n
9561025
1026+newtype NetworkID = NetworkID Text
1027+ deriving (Eq, Show)
1028+
1029+-- | Used for extracting the id of the container from the newtype
1030+fromNetworkID :: NetworkID -> Text
1031+fromNetworkID (NetworkID t) = t
1032+
1033+-- | Used for parsing a Text value into a NetworkID.
1034+toNetworkID :: Text -> Maybe NetworkID
1035+toNetworkID t = Just $ NetworkID t
1036+
1037+instance FromJSON NetworkID where
1038+ parseJSON (JSON.Object o) = do
1039+ nid <- o .: "Id"
1040+ return $ NetworkID nid
1041+ parseJSON _ = fail "NetworkID is not an object."
1042+
1043+instance ToJSON NetworkID where
1044+ toJSON (NetworkID nid) = object ["Id" .= nid]
1045+
9571046data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9581047
9591048instance Show PortType where