@@ -76,22 +76,6 @@ module Docker.Client.Types (
7676 , HostConfig(..)
7777 , defaultHostConfig
7878 , NetworkingConfig(..)
79− , NetworkScope(..)
80− , CIDR(..)
81− , IPAMDriver(..)
82− , IPAMConfig(..)
83− , IPAM(..)
84− , NetworkContainer(..)
85− , NetworkDetails(..)
86− , NetworkType(..)
87− , NetworkName
88− , NetworkFilter(..)
89− , ConnectConfig(..)
90− , defaultConnectConfig
91− , EndpointSettings(..)
92− , defaultEndpointSettings
93− , IPAMSettings(..)
94− , defaultIPAMSettings
9579 , EndpointConfig(..)
9680 , Ulimit(..)
9781 , ContainerResources(..)
@@ -130,7 +114,6 @@ import qualified Data.Text as T
130114import Data.Time.Clock (UTCTime)
131115import qualified Data.Vector as V
132116import GHC.Generics (Generic)
133−import Numeric (readDec)
134117import Prelude hiding (all, tail)
135118import Text.Read (readMaybe)
136119
@@ -156,9 +139,6 @@ data Endpoint =
156139 | DeleteImageEndpoint ImageDeleteOpts ImageID
157140 | CreateNetworkEndpoint CreateNetworkOpts
158141 | RemoveNetworkEndpoint NetworkID
159− | ListNetworksEndpoint [NetworkFilter]
160− | InspectNetworkEndpoint NetworkID
161− | ConnectNetworkEndpoint NetworkID ConnectConfig
162142 deriving (Eq, Show)
163143
164144-- | We should newtype this
@@ -878,198 +858,6 @@ instance ToJSON CreateNetworkOpts where
878858 , "EnableIPv6" .= createNetworkEnableIPv6 opts
879859 ]
880860
881−data NetworkScope = LocalScope | GlobalScope | SwarmScope deriving (Eq, Show)
882−
883−fromNetworkScope :: NetworkScope -> Text
884−fromNetworkScope LocalScope = "local"
885−fromNetworkScope GlobalScope = "global"
886−fromNetworkScope SwarmScope = "swarm"
887−
888−instance ToJSON NetworkScope where
889− toJSON = JSON.String . fromNetworkScope
890−
891−instance FromJSON NetworkScope where
892− parseJSON "local" = return LocalScope
893− parseJSON "global" = return GlobalScope
894− parseJSON "swarm" = return SwarmScope
895− parseJSON _ = fail "Failed to parse NetworkScope"
896−
897−data CIDR = CIDR Text Int deriving (Eq, Show)
898−
899−instance FromJSON CIDR where
900− parseJSON (JSON.String t) = case T.splitOn "/" t of
901− [a,p] -> CIDR a <$> parsePrefixLen p
902− _ -> fail "Failed to parse CIDR"
903− where
904− parsePrefixLen p = case readDec (T.unpack p) of
905− (n,""):_ -> return n
906− _ -> fail "Failed to parse CIDR prefix length"
907− parseJSON _ = fail "Failed to parse CIDR"
908−
909−data IPAMDriver = DefaultIPAMDriver | NamedIPAMDriver Text deriving (Eq, Show)
910−
911−instance FromJSON IPAMDriver where
912− parseJSON (JSON.String "default") = return DefaultIPAMDriver
913− parseJSON (JSON.String t) = return $ NamedIPAMDriver t
914− parseJSON _ = fail "IPAMDriver is not a string"
915−
916−data IPAMConfig = IPAMConfig
917− { ipamConfigSubnet :: CIDR
918− , ipamConfigIPRange :: Maybe CIDR
919− , ipamSubnetGateway :: Maybe Text
920− , ipamConfigAuxAddress :: Maybe Text
921− } deriving (Eq, Show)
922−
923−instance FromJSON IPAMConfig where
924− parseJSON (JSON.Object o) = IPAMConfig
925− <$> o .: "Subnet"
926− <*> o .:? "IPRange"
927− <*> o .:? "Gateway"
928− <*> o .:? "AuxAddress"
929− parseJSON _ = fail "IPAMConfig is not an object"
930−
931−data IPAM = IPAM
932− { ipamDriver :: IPAMDriver
933− , ipamConfig :: [IPAMConfig]
934− , ipamOptions :: HM.HashMap Text Text
935− } deriving (Eq, Show)
936−
937−instance FromJSON IPAM where
938− parseJSON (JSON.Object o) = IPAM
939− <$> o .:? "Driver" .!= DefaultIPAMDriver
940− <*> o .:? "Config" .!= []
941− <*> o .:? "Options" .!= HM.empty
942− parseJSON _ = fail "IPAM is not an object"
943−
944−data NetworkContainer = NetworkContainer
945− { networkContainerName :: ContainerName
946− , networkContainerEndpointID :: Text
947− , networkContainerMacAddress :: Text
948− , networkContainerIPv4Address :: Text
949− , networkContainerIPv6Address :: Text
950− } deriving (Eq, Show)
951−
952−instance FromJSON NetworkContainer where
953− parseJSON (JSON.Object o) = NetworkContainer
954− <$> o .: "Name"
955− <*> o .: "EndpointID"
956− <*> o .: "MacAddress"
957− <*> o .: "IPv4Address"
958− <*> o .: "IPv6Address"
959− parseJSON _ = fail "NetworkContainer is not an object"
960−
961−data NetworkDetails = NetworkDetails
962− { networkDetailsName :: Text
963− , networkDetailsID :: NetworkID
964− , networkDetailsCreated :: UTCTime
965− , networkDetailsScope :: NetworkScope
966− , networkDetailsDriver :: NetworkMode
967− , networkDetailsEnableIPv6 :: Bool
968− , networkDetailsInternal :: Bool
969− , networkDetailsAttachable :: Bool
970− , networkDetailsIngress :: Bool
971− , networkDetailsIPAM :: IPAM
972− , networkDetailsOptions :: HM.HashMap Text Text
973− , networkDetailsLabels :: HM.HashMap Text Text
974− , networkDetailsContainers :: HM.HashMap Text NetworkContainer
975− } deriving (Eq, Show)
976−
977−instance FromJSON NetworkDetails where
978− parseJSON v@(JSON.Object o) = NetworkDetails
979− <$> o .: "Name"
980− <*> parseJSON v
981− <*> o .: "Created"
982− <*> o .: "Scope"
983− <*> o .: "Driver"
984− <*> o .: "EnableIPv6"
985− <*> o .: "Internal"
986− <*> o .: "Attachable"
987− <*> o .: "Ingress"
988− <*> o .: "IPAM"
989− <*> o .:? "Options" .!= HM.empty
990− <*> o .:? "Labels" .!= HM.empty
991− <*> o .:? "Containers" .!= HM.empty
992− parseJSON _ = fail "NetworkDetails is not an object"
993−
994−data NetworkType = BuiltinNetwork | CustomNetwork deriving (Eq, Show)
995−
996−fromNetworkType :: NetworkType -> Text
997−fromNetworkType BuiltinNetwork = "builtin"
998−fromNetworkType CustomNetwork = "custom"
999−
1000−type NetworkName = Text
1001−
1002−instance ToJSON NetworkType where
1003− toJSON = JSON.String . fromNetworkType
1004−
1005−instance FromJSON NetworkType where
1006− parseJSON (JSON.String "builtin") = return BuiltinNetwork
1007− parseJSON (JSON.String "custom") = return CustomNetwork
1008− parseJSON _ = fail "Failed to parse NetworkType"
1009−
1010−data NetworkFilter
1011− = NetworkFilterName Text
1012− | NetworkFilterID NetworkID
1013− | NetworkFilterLabel Text
1014− | NetworkFilterDriver NetworkMode
1015− | NetworkFilterScope NetworkScope
1016− | NetworkFilterType NetworkType
1017− deriving (Eq, Show)
1018−
1019−instance {-# OVERLAPPING #-} ToJSON [NetworkFilter] where
1020− toJSON = object . fmap toKV
1021− where
1022− toKV (NetworkFilterName n) = "name" .= [n]
1023− toKV (NetworkFilterID i) = "id" .= [fromNetworkID i]
1024− toKV (NetworkFilterLabel l) = "label" .= [l]
1025− toKV (NetworkFilterDriver d) = "driver" .= [fromNetworkMode d]
1026− toKV (NetworkFilterScope s) = "scope" .= [fromNetworkScope s]
1027− toKV (NetworkFilterType t) = "type" .= [fromNetworkType t]
1028−
1029−data ConnectConfig = ConnectConfig
1030− { connectContainer :: Text
1031− , connectEndpointConfig :: EndpointSettings
1032− } deriving (Eq, Show, Generic)
1033−
1034−instance ToJSON ConnectConfig where
1035− toJSON = genericToJSON defaultOptions { fieldLabelModifier = drop 7 }
1036−
1037−defaultConnectConfig :: Text -> ConnectConfig
1038−defaultConnectConfig = flip ConnectConfig defaultEndpointSettings
1039−
1040−data EndpointSettings = EndpointSettings
1041− { endpointIPAMConfig :: IPAMSettings
1042− , endpointLinks :: [Text]
1043− , endpointAliases :: [Text]
1044− , endpointNetworkID :: Maybe Text
1045− , endpointEndpointID :: Maybe Text
1046− , endpointGateway :: Maybe Text
1047− , endpointIPAddress :: Maybe Text
1048− , endpointIPPrefixLen :: Maybe Int
1049− , endpointIPv6Gateway :: Maybe Text
1050− , endpointGlobalIPv6Address :: Maybe Text
1051− , endpointGlobalIPv6PrefixLen :: Maybe Int
1052− , endpointMacAddress :: Maybe Text
1053− } deriving (Eq, Show, Generic)
1054−
1055−instance ToJSON EndpointSettings where
1056− toJSON = genericToJSON defaultOptions { fieldLabelModifier = drop 8 }
1057−
1058−defaultEndpointSettings :: EndpointSettings
1059−defaultEndpointSettings = EndpointSettings defaultIPAMSettings [] [] Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
1060−
1061−data IPAMSettings = IPAMSettings
1062− { ipamIPv4Address :: Maybe Text
1063− , ipamIPv6Address :: Maybe Text
1064− , ipamLinkLocalIPs :: [Text]
1065− } deriving (Eq, Show, Generic)
1066−
1067−instance ToJSON IPAMSettings where
1068− toJSON = genericToJSON defaultOptions { fieldLabelModifier = drop 4 }
1069−
1070−defaultIPAMSettings :: IPAMSettings
1071−defaultIPAMSettings = IPAMSettings Nothing Nothing []
1072−
1073861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
1074862-- | Set permissions on volumes that you mount in the container.
1075863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -1239,14 +1027,11 @@ instance FromJSON NetworkMode where
12391027 parseJSON (JSON.String n) = return $ NetworkNamed n
12401028 parseJSON _ = fail "Unknown NetworkMode"
12411029
1242−fromNetworkMode :: NetworkMode -> Text
1243−fromNetworkMode NetworkBridge = "bridge"
1244−fromNetworkMode NetworkHost = "host"
1245−fromNetworkMode NetworkDisabled = "none"
1246−fromNetworkMode (NetworkNamed n) = n
1247−
12481030instance ToJSON NetworkMode where
1249− toJSON = JSON.String . fromNetworkMode
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
12501035
12511036newtype NetworkID = NetworkID Text
12521037 deriving (Eq, Show)
@@ -1779,7 +1564,11 @@ instance FromJSON ContainerConfig where
17791564 macAddress labels stopSignal
17801565 parseJSON _ = fail "NetworkSettings is not an object."
17811566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
17821570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
17831572parseIntegerText t = case readMaybe $ T.unpack t of
17841573 Nothing ->
17851574 fail "Could not parse Integer"