@@ -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(..)
@@ -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(..)
@@ -125,10 +132,13 @@ data Endpoint =
125132 | UnpauseContainerEndpoint ContainerID
126133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
127134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
128− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
129136 | InspectContainerEndpoint ContainerID
130137 | BuildImageEndpoint BuildOpts FilePath
131138 | 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
132142 deriving (Eq, Show)
133143
134144-- | We should newtype this
@@ -752,7 +762,7 @@ defaultStartOpts :: StartOpts
752762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
753763
754764-- | Options for deleting a container.
755−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
756766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
757767 , force :: Bool -- ^ If the container is still running force deletion anyway.
758768 } deriving (Eq, Show)
@@ -782,8 +792,15 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
782792-- | Default options for deleting a container. Most of the time we DON'T
783793-- want to delete the container's volumes or force delete it if it's
784794-- running.
785−defaultDeleteOpts :: DeleteOpts
786−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
787804
788805-- | Timestamp alias.
789806type Timestamp = Integer
@@ -811,6 +828,36 @@ defaultLogOpts = LogOpts { stdout = True
811828 , tail = All
812829 }
813830
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+
814861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
815862-- | Set permissions on volumes that you mount in the container.
816863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -986,6 +1033,26 @@ instance ToJSON NetworkMode where
9861033 toJSON NetworkDisabled = JSON.String "none"
9871034 toJSON (NetworkNamed n) = JSON.String n
9881035
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+
9891056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9901057
9911058instance Show PortType where
@@ -1497,7 +1564,11 @@ instance FromJSON ContainerConfig where
14971564 macAddress labels stopSignal
14981565 parseJSON _ = fail "NetworkSettings is not an object."
14991566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
15001570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
15011572parseIntegerText t = case readMaybe $ T.unpack t of
15021573 Nothing ->
15031574 fail "Could not parse Integer"