@@ -19,7 +19,6 @@ import Data.Bool
1919import qualified Data.ByteString.Lazy as L
2020import Data.Default
2121import qualified Data.Map as Map
22−import Data.String (IsString, fromString)
2322import qualified Data.Text as T
2423import GHC.Generics (Generic)
2524import Network.Wreq.Types (Postable)
@@ -101,10 +100,8 @@ data SSLOptions = SSLOptions {
101100 } deriving Show
102101
103102
104−data ResourceId = ResourceId { _uuid :: String } deriving (Show, Eq)
105−
106103data DockerImage = DockerImage
107− { _imageId :: ResourceId
104+ { _imageId :: ImageID
108105 , _imageCreatedAt :: Int
109106 , _parentId :: Maybe String
110107 , _repoTags :: [Tag]
@@ -148,8 +145,8 @@ data LogOpts = LogOpts
148145defaultLogOpts = LogOpts True True False
149146
150147data DockerContainer = DockerContainer
151− { _containerId :: ResourceId
152− , _containerImageId :: ResourceId
148+ { _containerId :: ContainerID
149+ , _containerImageId :: ImageID
153150 , _command :: String
154151 , _containerCreatedAt :: Int
155152 , _names :: [String]
@@ -274,7 +271,7 @@ instance ToJSON RestartPolicy where
274271
275272instance FromJSON DockerImage where
276273 parseJSON (Object v) =
277− DockerImage <$> ResourceId <$> (v .: "Id")
274+ DockerImage <$> (v .: "Id")
278275 <*> (v .: "Created")
279276 <*> (v .:? "ParentId")
280277 <*> (v .: "RepoTags")
@@ -290,8 +287,8 @@ instance FromJSON PortMap where
290287
291288instance FromJSON DockerContainer where
292289 parseJSON (Object v) =
293− DockerContainer <$> (ResourceId <$> (v .: "Id"))
294− <*> (ResourceId <$> (v .: "Id"))
290+ DockerContainer <$> (v .: "Id")
291+ <*> (v .: "Id")
295292 <*> (v .: "Command")
296293 <*> (v .: "Created")
297294 <*> (v .: "Names")