@@ -23,7 +23,7 @@ module Docker.Client.Types (
23 , ContainerPortInfo(..)
23 , ContainerPortInfo(..)
24 , Container(..)
24 , Container(..)
25 , ContainerState(..)
25 , ContainerState(..)
26− , Status(..)
26+ , State(..)
28 , Label(..)
28 , Label(..)
@@ -238,7 +238,7 @@ data ContainerDetails = ContainerDetails {
238 , processLabel :: Text
238 , processLabel :: Text
239 , resolveConfPath :: FilePath
239 , resolveConfPath :: FilePath
240 , restartCount :: Int
240 , restartCount :: Int
241− , state :: ContainerState
241+ , containerDetailsState :: ContainerState
242 , mounts :: [Mount]
242 , mounts :: [Mount]
244 deriving (Eq, Show, Generic)
244 deriving (Eq, Show, Generic)
@@ -281,7 +281,7 @@ data ContainerState = ContainerState {
281 , restarting :: Bool
281 , restarting :: Bool
282 , running :: Bool
282 , running :: Bool
283 , startedAt :: UTCTime
283 , startedAt :: UTCTime
284− , status :: Status
284+ , state :: State
286 deriving (Eq, Show, Generic)
286 deriving (Eq, Show, Generic)
@@ -511,7 +511,8 @@ data Container = Container
511 , containerImageId :: ImageID
511 , containerImageId :: ImageID
512 , containerCommand :: Text
512 , containerCommand :: Text
513 , containerCreatedAt :: Int
513 , containerCreatedAt :: Int
514+ , containerState :: State
514− , containerStatus :: Status
515+ , containerStatus :: Maybe Text
515 , containerPorts :: [ContainerPortInfo]
516 , containerPorts :: [ContainerPortInfo]
516 , containerLabels :: [Label]
517 , containerLabels :: [Label]
517 , containerNetworks :: [Network]
518 , containerNetworks :: [Network]
@@ -527,6 +528,7 @@ instance FromJSON Container where
527 <*> (v .: "Command") -- Doesn't exist anymore
528 <*> (v .: "Command") -- Doesn't exist anymore
528 <*> (v .: "Created")
529 <*> (v .: "Created")
529 <*> (v .: "State")
530 <*> (v .: "State")
530 <*> (v .: "Ports")
532 <*> (v .: "Ports")
531 <*> (v .: "Labels")
533 <*> (v .: "Labels")
532 <*> (v .: "NetworkSettings" >>= parseNetworks)
534 <*> (v .: "NetworkSettings" >>= parseNetworks)
@@ -537,11 +539,11 @@ instance FromJSON Container where
537 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
539 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
538 parseJSON _ = fail "Container: Not a JSON object."
540 parseJSON _ = fail "Container: Not a JSON object."
540−-- | Represents the status of the container life cycle.
542+-- | Represents the state of the container life cycle.
541−data Status = Created | Restarting | Running | Paused | Exited | Dead
543+data State = Created | Restarting | Running | Paused | Exited | Dead
542 deriving (Eq, Show, Generic)
544 deriving (Eq, Show, Generic)
544−instance FromJSON Status where
546+instance FromJSON State where
545 parseJSON (JSON.String "running") = return Running
547 parseJSON (JSON.String "running") = return Running
546 parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
548 parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
547 parseJSON (JSON.String "restarting") = return Restarting
549 parseJSON (JSON.String "restarting") = return Restarting