@@ -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(..)
@@ -26,7 +23,7 @@ module Docker.Client.Types (
2623 , ContainerPortInfo(..)
2724 , Container(..)
2825 , ContainerState(..)
29− , State(..)
26+ , Status(..)
3027 , Digest
3128 , Label(..)
3229 , Tag
@@ -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(..)
@@ -75,8 +68,6 @@ module Docker.Client.Types (
7568 , UTSMode(..)
7669 , HostConfig(..)
7770 , defaultHostConfig
78− , NetworkingConfig(..)
79− , EndpointConfig(..)
8071 , Ulimit(..)
8172 , ContainerResources(..)
8273 , defaultContainerResources
@@ -132,13 +123,10 @@ data Endpoint =
132123 | UnpauseContainerEndpoint ContainerID
133124 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134125 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
126+ | DeleteContainerEndpoint DeleteOpts ContainerID
136127 | InspectContainerEndpoint ContainerID
137128 | BuildImageEndpoint BuildOpts FilePath
138129 | 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
142130 deriving (Eq, Show)
143131
144132-- | We should newtype this
@@ -250,7 +238,7 @@ data ContainerDetails = ContainerDetails {
250238 , processLabel :: Text
251239 , resolveConfPath :: FilePath
252240 , restartCount :: Int
253− , containerDetailsState :: ContainerState
241+ , state :: ContainerState
254242 , mounts :: [Mount]
255243 }
256244 deriving (Eq, Show, Generic)
@@ -258,11 +246,11 @@ data ContainerDetails = ContainerDetails {
258246-- | Data type used for parsing the mount information from a container
259247-- list.
260248data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
249+ mountName :: Text
262250 , mountSource :: FilePath
263251 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
252+ , mountDriver :: Text
253+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266254 , mountRW :: Bool
267255 , mountPropogation :: Text
268256 }
@@ -270,14 +258,14 @@ data Mount = Mount {
270258
271259instance FromJSON Mount where
272260 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
261+ name <- o .: "Name"
274262 src <- o .: "Source"
275263 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
264+ driver <- o .: "Driver"
265+ mode <- o .: "Mode"
278266 rw <- o .: "RW"
279267 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
268+ return $ Mount name src dest driver mode rw prop
281269 parseJSON _ = fail "Mount is not an object"
282270
283271-- | Data type used for parsing the container state from a list of
@@ -293,7 +281,7 @@ data ContainerState = ContainerState {
293281 , restarting :: Bool
294282 , running :: Bool
295283 , startedAt :: UTCTime
296− , state :: State
284+ , status :: Status
297285 }
298286 deriving (Eq, Show, Generic)
299287
@@ -523,8 +511,7 @@ data Container = Container
523511 , containerImageId :: ImageID
524512 , containerCommand :: Text
525513 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
514+ , containerStatus :: Status
528515 , containerPorts :: [ContainerPortInfo]
529516 , containerLabels :: [Label]
530517 , containerNetworks :: [Network]
@@ -532,14 +519,13 @@ data Container = Container
532519 } deriving (Show, Eq)
533520
534521instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
522+ parseJSON (JSON.Object v) =
523+ Container <$> (v .: "Id")
537524 <*> (v .: "Names")
538525 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
526+ <*> (v .: "ImageID")
527+ <*> (v .: "Command")
541528 <*> (v .: "Created")
542− <*> (v .: "State")
543529 <*> (v .: "Status")
544530 <*> (v .: "Ports")
545531 <*> (v .: "Labels")
@@ -549,20 +535,21 @@ instance FromJSON Container where
549535 parseNetworks (JSON.Object v) =
550536 (v .: "Networks") >>= parseJSON
551537 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
538+
552539 parseJSON _ = fail "Container: Not a JSON object."
553540
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
541+-- | Represents the status of the container life cycle.
542+data Status = Created | Restarting | Running | Paused | Exited | Dead
556543 deriving (Eq, Show, Generic)
557544
558−instance FromJSON State where
545+instance FromJSON Status where
559546 parseJSON (JSON.String "running") = return Running
560547 parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561548 parseJSON (JSON.String "restarting") = return Restarting
562549 parseJSON (JSON.String "paused") = return Paused
563550 parseJSON (JSON.String "exited") = return Exited
564551 parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
552+ parseJSON _ = fail "Unknown Status"
566553
567554-- | Alias for representing a RepoDigest. We could newtype this and add
568555-- some validation.
@@ -623,46 +610,20 @@ instance FromJSON Image where
623610 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624611 parseJSON _ = fail "Failed to parse DockerImage."
625612
626−-- | Alias for Aliases.
627−type Alias = Text
628−
629−-- | EndpointsConfig is container configuration for a specific network
630−newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
631−
632−instance ToJSON EndpointConfig where
633− toJSON (EndpointConfig aliases) = JSON.object
634− [ "Aliases" .= aliases
635− ]
636−
637−-- | Alias for endpoint name
638−type EndpointName = Text
639−
640−-- | Data type for the NetworkingConfig section of the container settings
641−newtype NetworkingConfig = NetworkingConfig
642− { endpointsConfig :: HM.HashMap EndpointName EndpointConfig
643− } deriving (Eq, Show)
644−
645−instance ToJSON NetworkingConfig where
646− toJSON (NetworkingConfig endpointsConfig) = JSON.object
647− [ "EndpointsConfig" .= endpointsConfig
648− ]
649613
650614-- | Options used for creating a Container.
651615data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
616+ containerConfig :: ContainerConfig
617+ , hostConfig :: HostConfig
655618 } deriving (Eq, Show)
656619
657620instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
621+ toJSON (CreateOpts cc hc) = do
659622 let ccJSON = toJSON cc
660623 let hcJSON = toJSON hc
661624 case ccJSON of
662625 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665− JSON.Object o2
626+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666627 _ -> error "ContainerConfig is not an object." -- This should never happen.
667628
668629-- | Container configuration used for creating a container with sensible
@@ -697,7 +658,7 @@ defaultHostConfig = HostConfig {
697658 binds=[]
698659 , containerIDFile=Nothing
699660 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
661+ , networkMode=Bridge
701662 , portBindings=[]
702663 , restartPolicy=RestartOff
703664 , volumeDriver=Nothing
@@ -744,11 +705,7 @@ defaultContainerResources = ContainerResources {
744705-- | Default create options when creating a container. You only need to
745706-- specify an image name and the rest is all sensible defaults.
746707defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
708+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752709
753710-- | Override the key sequence for detaching a container.
754711-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,7 +719,7 @@ defaultStartOpts :: StartOpts
762719defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763720
764721-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
722+data DeleteOpts = DeleteOpts {
766723 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767724 , force :: Bool -- ^ If the container is still running force deletion anyway.
768725 } deriving (Eq, Show)
@@ -792,15 +749,8 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
792749-- | Default options for deleting a container. Most of the time we DON'T
793750-- want to delete the container's volumes or force delete it if it's
794751-- 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
752+defaultDeleteOpts :: DeleteOpts
753+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804754
805755-- | Timestamp alias.
806756type Timestamp = Integer
@@ -828,36 +778,6 @@ defaultLogOpts = LogOpts { stdout = True
828778 , tail = All
829779 }
830780
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−
861781-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862782-- | Set permissions on volumes that you mount in the container.
863783data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -869,8 +789,6 @@ instance ToJSON VolumePermission where
869789instance FromJSON VolumePermission where
870790 parseJSON "rw" = return ReadWrite
871791 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874792 parseJSON _ = fail "Failed to parse VolumePermission"
875793
876794-- | Used for marking a directory in the container as "exposed" hence
@@ -1017,41 +935,19 @@ instance FromJSON LogDriverConfig where
1017935 parseJSON _ = fail "LogDriverConfig is not an object"
1018936
1019937-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
938+data NetworkMode = Bridge | Host | NetworkDisabled
1021939 deriving (Eq, Show, Ord)
1022940
1023941instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
942+ parseJSON (JSON.String "bridge") = return Bridge
943+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026944 parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028945 parseJSON _ = fail "Unknown NetworkMode"
1029946
1030947instance ToJSON NetworkMode where
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
1035−
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]
948+ toJSON Bridge = JSON.String "bridge"
949+ toJSON Host = JSON.String "host"
950+ toJSON NetworkDisabled = JSON.String "none"
1055951
1056952data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057953
@@ -1452,7 +1348,7 @@ instance FromJSON EnvVar where
14521348 parseJSON _ = fail "EnvVar is not a string"
14531349
14541350instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1351+ toJSON (EnvVar n v) = object [n .= v]
14561352
14571353-- | ExposedPort represents a port (and it's type)
14581354-- that a container should expose to other containers or the host system.
@@ -1564,11 +1460,7 @@ instance FromJSON ContainerConfig where
15641460 macAddress labels stopSignal
15651461 parseJSON _ = fail "NetworkSettings is not an object."
15661462
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701463parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721464parseIntegerText t = case readMaybe $ T.unpack t of
15731465 Nothing ->
15741466 fail "Could not parse Integer"