@@ -11,9 +11,6 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14− , NetworkID
15− , fromNetworkID
16− , toNetworkID
1714 , Timeout(..)
1815 , StatusCode(..)
1916 , Signal(..)
@@ -40,16 +37,12 @@ module Docker.Client.Types (
4037 , DetachKeys(..)
4138 , StartOpts(..)
4239 , defaultStartOpts
43− , ContainerDeleteOpts(..)
44− , defaultContainerDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
40+ , DeleteOpts(..)
41+ , defaultDeleteOpts
4742 , Timestamp
4843 , TailLogOpt(..)
4944 , LogOpts(..)
5045 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
5346 , VolumePermission(..)
5447 , Bind(..)
5548 , Volume(..)
@@ -132,13 +125,10 @@ data Endpoint =
132125 | UnpauseContainerEndpoint ContainerID
133126 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134127 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
128+ | DeleteContainerEndpoint DeleteOpts ContainerID
136129 | InspectContainerEndpoint ContainerID
137130 | BuildImageEndpoint BuildOpts FilePath
138131 | 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
142132 deriving (Eq, Show)
143133
144134-- | We should newtype this
@@ -634,12 +624,9 @@ instance ToJSON EndpointConfig where
634624 [ "Aliases" .= aliases
635625 ]
636626
637−-- | Alias for endpoint name
638−type EndpointName = Text
639−
640627-- | Data type for the NetworkingConfig section of the container settings
641628newtype NetworkingConfig = NetworkingConfig
642− { endpointsConfig :: HM.HashMap EndpointName EndpointConfig
629+ { endpointsConfig :: HM.HashMap Text EndpointConfig
643630 } deriving (Eq, Show)
644631
645632instance ToJSON NetworkingConfig where
@@ -649,9 +636,9 @@ instance ToJSON NetworkingConfig where
649636
650637-- | Options used for creating a Container.
651638data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
639+ containerConfig :: ContainerConfig
640+ , hostConfig :: HostConfig
641+ , networkingConfig :: Maybe NetworkingConfig
655642 } deriving (Eq, Show)
656643
657644instance ToJSON CreateOpts where
@@ -661,7 +648,9 @@ instance ToJSON CreateOpts where
661648 case ccJSON of
662649 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663650 let o1 = HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
651+ let o2 = case nc of
652+ Nothing -> o1
653+ Just _ -> HM.insert "NetworkingConfig" (toJSON nc) o1
665654 JSON.Object o2
666655 _ -> error "ContainerConfig is not an object." -- This should never happen.
667656
@@ -747,7 +736,7 @@ defaultCreateOpts :: T.Text -> CreateOpts
747736defaultCreateOpts imageName = CreateOpts
748737 { containerConfig = defaultContainerConfig imageName
749738 , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
739+ , networkingConfig = Nothing
751740 }
752741
753742-- | Override the key sequence for detaching a container.
@@ -762,7 +751,7 @@ defaultStartOpts :: StartOpts
762751defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763752
764753-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
754+data DeleteOpts = DeleteOpts {
766755 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767756 , force :: Bool -- ^ If the container is still running force deletion anyway.
768757 } deriving (Eq, Show)
@@ -792,15 +781,8 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
792781-- | Default options for deleting a container. Most of the time we DON'T
793782-- want to delete the container's volumes or force delete it if it's
794783-- running.
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
784+defaultDeleteOpts :: DeleteOpts
785+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804786
805787-- | Timestamp alias.
806788type Timestamp = Integer
@@ -828,36 +810,6 @@ defaultLogOpts = LogOpts { stdout = True
828810 , tail = All
829811 }
830812
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−
861813-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862814-- | Set permissions on volumes that you mount in the container.
863815data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -1033,26 +985,6 @@ instance ToJSON NetworkMode where
1033985 toJSON NetworkDisabled = JSON.String "none"
1034986 toJSON (NetworkNamed n) = JSON.String n
1035987
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]
1055−
1056988data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057989
1058990instance Show PortType where
@@ -1564,11 +1496,7 @@ instance FromJSON ContainerConfig where
15641496 macAddress labels stopSignal
15651497 parseJSON _ = fail "NetworkSettings is not an object."
15661498
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701499parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721500parseIntegerText t = case readMaybe $ T.unpack t of
15731501 Nothing ->
15741502 fail "Could not parse Integer"