@@ -19,7 +19,6 @@ import Data.Bool
19import qualified Data.ByteString.Lazy as L
19import qualified Data.ByteString.Lazy as L
20import Data.Default
20import Data.Default
21import qualified Data.Map as Map
21import qualified Data.Map as Map
22−import Data.String (IsString, fromString)
23import qualified Data.Text as T
22import qualified Data.Text as T
24import GHC.Generics (Generic)
23import GHC.Generics (Generic)
25import Network.Wreq.Types (Postable)
24import Network.Wreq.Types (Postable)
@@ -101,10 +100,8 @@ data SSLOptions = SSLOptions {
101 } deriving Show
100 } deriving Show
104−data ResourceId = ResourceId { _uuid :: String } deriving (Show, Eq)
106data DockerImage = DockerImage
103data DockerImage = DockerImage
107− { _imageId :: ResourceId
104+ { _imageId :: ImageID
108 , _imageCreatedAt :: Int
105 , _imageCreatedAt :: Int
109 , _parentId :: Maybe String
106 , _parentId :: Maybe String
110 , _repoTags :: [Tag]
107 , _repoTags :: [Tag]
@@ -148,8 +145,8 @@ data LogOpts = LogOpts
148defaultLogOpts = LogOpts True True False
145defaultLogOpts = LogOpts True True False
150data DockerContainer = DockerContainer
147data DockerContainer = DockerContainer
151− { _containerId :: ResourceId
148+ { _containerId :: ContainerID
152− , _containerImageId :: ResourceId
149+ , _containerImageId :: ImageID
153 , _command :: String
150 , _command :: String
154 , _containerCreatedAt :: Int
151 , _containerCreatedAt :: Int
155 , _names :: [String]
152 , _names :: [String]
@@ -274,7 +271,7 @@ instance ToJSON RestartPolicy where
275instance FromJSON DockerImage where
272instance FromJSON DockerImage where
276 parseJSON (Object v) =
273 parseJSON (Object v) =
277− DockerImage <$> ResourceId <$> (v .: "Id")
274+ DockerImage <$> (v .: "Id")
278 <*> (v .: "Created")
275 <*> (v .: "Created")
279 <*> (v .:? "ParentId")
276 <*> (v .:? "ParentId")
280 <*> (v .: "RepoTags")
277 <*> (v .: "RepoTags")
@@ -290,8 +287,8 @@ instance FromJSON PortMap where
291instance FromJSON DockerContainer where
288instance FromJSON DockerContainer where
292 parseJSON (Object v) =
289 parseJSON (Object v) =
293− DockerContainer <$> (ResourceId <$> (v .: "Id"))
290+ DockerContainer <$> (v .: "Id")
294− <*> (ResourceId <$> (v .: "Id"))
291+ <*> (v .: "Id")
295 <*> (v .: "Command")
292 <*> (v .: "Command")
296 <*> (v .: "Created")
293 <*> (v .: "Created")
297 <*> (v .: "Names")
294 <*> (v .: "Names")