@@ -76,16 +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(..)
8979 , EndpointConfig(..)
9080 , Ulimit(..)
9181 , ContainerResources(..)
@@ -124,7 +114,6 @@ import qualified Data.Text as T
124114import Data.Time.Clock (UTCTime)
125115import qualified Data.Vector as V
126116import GHC.Generics (Generic)
127−import Numeric (readDec)
128117import Prelude hiding (all, tail)
129118import Text.Read (readMaybe)
130119
@@ -150,8 +139,6 @@ data Endpoint =
150139 | DeleteImageEndpoint ImageDeleteOpts ImageID
151140 | CreateNetworkEndpoint CreateNetworkOpts
152141 | RemoveNetworkEndpoint NetworkID
153− | ListNetworksEndpoint [NetworkFilter]
154− | InspectNetworkEndpoint NetworkID
155142 deriving (Eq, Show)
156143
157144-- | We should newtype this
@@ -871,154 +858,6 @@ instance ToJSON CreateNetworkOpts where
871858 , "EnableIPv6" .= createNetworkEnableIPv6 opts
872859 ]
873860
874−data NetworkScope = LocalScope | GlobalScope | SwarmScope deriving (Eq, Show)
875−
876−fromNetworkScope :: NetworkScope -> Text
877−fromNetworkScope LocalScope = "local"
878−fromNetworkScope GlobalScope = "global"
879−fromNetworkScope SwarmScope = "swarm"
880−
881−instance ToJSON NetworkScope where
882− toJSON = JSON.String . fromNetworkScope
883−
884−instance FromJSON NetworkScope where
885− parseJSON "local" = return LocalScope
886− parseJSON "global" = return GlobalScope
887− parseJSON "swarm" = return SwarmScope
888− parseJSON _ = fail "Failed to parse NetworkScope"
889−
890−data CIDR = CIDR Text Int deriving (Eq, Show)
891−
892−instance FromJSON CIDR where
893− parseJSON (JSON.String t) = case T.splitOn "/" t of
894− [a,p] -> CIDR a <$> parsePrefixLen p
895− _ -> fail "Failed to parse CIDR"
896− where
897− parsePrefixLen p = case readDec (T.unpack p) of
898− (n,""):_ -> return n
899− _ -> fail "Failed to parse CIDR prefix length"
900− parseJSON _ = fail "Failed to parse CIDR"
901−
902−data IPAMDriver = DefaultIPAMDriver | NamedIPAMDriver Text deriving (Eq, Show)
903−
904−instance FromJSON IPAMDriver where
905− parseJSON (JSON.String "default") = return DefaultIPAMDriver
906− parseJSON (JSON.String t) = return $ NamedIPAMDriver t
907− parseJSON _ = fail "IPAMDriver is not a string"
908−
909−data IPAMConfig = IPAMConfig
910− { ipamConfigSubnet :: CIDR
911− , ipamConfigIPRange :: Maybe CIDR
912− , ipamSubnetGateway :: Maybe Text
913− , ipamConfigAuxAddress :: Maybe Text
914− } deriving (Eq, Show)
915−
916−instance FromJSON IPAMConfig where
917− parseJSON (JSON.Object o) = IPAMConfig
918− <$> o .: "Subnet"
919− <*> o .:? "IPRange"
920− <*> o .:? "Gateway"
921− <*> o .:? "AuxAddress"
922− parseJSON _ = fail "IPAMConfig is not an object"
923−
924−data IPAM = IPAM
925− { ipamDriver :: IPAMDriver
926− , ipamConfig :: [IPAMConfig]
927− , ipamOptions :: HM.HashMap Text Text
928− } deriving (Eq, Show)
929−
930−instance FromJSON IPAM where
931− parseJSON (JSON.Object o) = IPAM
932− <$> o .:? "Driver" .!= DefaultIPAMDriver
933− <*> o .:? "Config" .!= []
934− <*> o .:? "Options" .!= HM.empty
935− parseJSON _ = fail "IPAM is not an object"
936−
937−data NetworkContainer = NetworkContainer
938− { networkContainerName :: ContainerName
939− , networkContainerEndpointID :: Text
940− , networkContainerMacAddress :: Text
941− , networkContainerIPv4Address :: Text
942− , networkContainerIPv6Address :: Text
943− } deriving (Eq, Show)
944−
945−instance FromJSON NetworkContainer where
946− parseJSON (JSON.Object o) = NetworkContainer
947− <$> o .: "Name"
948− <*> o .: "EndpointID"
949− <*> o .: "MacAddress"
950− <*> o .: "IPv4Address"
951− <*> o .: "IPv6Address"
952− parseJSON _ = fail "NetworkContainer is not an object"
953−
954−data NetworkDetails = NetworkDetails
955− { networkDetailsName :: Text
956− , networkDetailsID :: NetworkID
957− , networkDetailsCreated :: UTCTime
958− , networkDetailsScope :: NetworkScope
959− , networkDetailsDriver :: NetworkMode
960− , networkDetailsEnableIPv6 :: Bool
961− , networkDetailsInternal :: Bool
962− , networkDetailsAttachable :: Bool
963− , networkDetailsIngress :: Bool
964− , networkDetailsIPAM :: IPAM
965− , networkDetailsOptions :: HM.HashMap Text Text
966− , networkDetailsLabels :: HM.HashMap Text Text
967− , networkDetailsContainers :: HM.HashMap Text NetworkContainer
968− } deriving (Eq, Show)
969−
970−instance FromJSON NetworkDetails where
971− parseJSON v@(JSON.Object o) = NetworkDetails
972− <$> o .: "Name"
973− <*> parseJSON v
974− <*> o .: "Created"
975− <*> o .: "Scope"
976− <*> o .: "Driver"
977− <*> o .: "EnableIPv6"
978− <*> o .: "Internal"
979− <*> o .: "Attachable"
980− <*> o .: "Ingress"
981− <*> o .: "IPAM"
982− <*> o .:? "Options" .!= HM.empty
983− <*> o .:? "Labels" .!= HM.empty
984− <*> o .:? "Containers" .!= HM.empty
985− parseJSON _ = fail "NetworkDetails is not an object"
986−
987−data NetworkType = BuiltinNetwork | CustomNetwork deriving (Eq, Show)
988−
989−fromNetworkType :: NetworkType -> Text
990−fromNetworkType BuiltinNetwork = "builtin"
991−fromNetworkType CustomNetwork = "custom"
992−
993−type NetworkName = Text
994−
995−instance ToJSON NetworkType where
996− toJSON = JSON.String . fromNetworkType
997−
998−instance FromJSON NetworkType where
999− parseJSON (JSON.String "builtin") = return BuiltinNetwork
1000− parseJSON (JSON.String "custom") = return CustomNetwork
1001− parseJSON _ = fail "Failed to parse NetworkType"
1002−
1003−data NetworkFilter
1004− = NetworkFilterName Text
1005− | NetworkFilterID NetworkID
1006− | NetworkFilterLabel Text
1007− | NetworkFilterDriver NetworkMode
1008− | NetworkFilterScope NetworkScope
1009− | NetworkFilterType NetworkType
1010− deriving (Eq, Show)
1011−
1012−instance {-# OVERLAPPING #-} ToJSON [NetworkFilter] where
1013− toJSON = object . fmap toKV
1014− where
1015− toKV (NetworkFilterName n) = "name" .= [n]
1016− toKV (NetworkFilterID i) = "id" .= [fromNetworkID i]
1017− toKV (NetworkFilterLabel l) = "label" .= [l]
1018− toKV (NetworkFilterDriver d) = "driver" .= [fromNetworkMode d]
1019− toKV (NetworkFilterScope s) = "scope" .= [fromNetworkScope s]
1020− toKV (NetworkFilterType t) = "type" .= [fromNetworkType t]
1021−
1022861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
1023862-- | Set permissions on volumes that you mount in the container.
1024863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -1188,14 +1027,11 @@ instance FromJSON NetworkMode where
11881027 parseJSON (JSON.String n) = return $ NetworkNamed n
11891028 parseJSON _ = fail "Unknown NetworkMode"
11901029
1191−fromNetworkMode :: NetworkMode -> Text
1192−fromNetworkMode NetworkBridge = "bridge"
1193−fromNetworkMode NetworkHost = "host"
1194−fromNetworkMode NetworkDisabled = "none"
1195−fromNetworkMode (NetworkNamed n) = n
1196−
11971030instance ToJSON NetworkMode where
1198− 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
11991035
12001036newtype NetworkID = NetworkID Text
12011037 deriving (Eq, Show)
@@ -1728,7 +1564,11 @@ instance FromJSON ContainerConfig where
17281564 macAddress labels stopSignal
17291565 parseJSON _ = fail "NetworkSettings is not an object."
17301566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
17311570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
17321572parseIntegerText t = case readMaybe $ T.unpack t of
17331573 Nothing ->
17341574 fail "Could not parse Integer"