@@ -11,11 +11,7 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14− , NetworkID
15− , fromNetworkID
16− , toNetworkID
1714 , Timeout(..)
18− , StatusCode(..)
1915 , Signal(..)
2016 , ContainerDetails(..)
2117 , DockerClientOpts(..)
@@ -26,30 +22,23 @@ module Docker.Client.Types (
2622 , ContainerPortInfo(..)
2723 , Container(..)
2824 , ContainerState(..)
29− , State(..)
25+ , Status(..)
3026 , Digest
3127 , Label(..)
3228 , Tag
3329 , Image(..)
34− , Entrypoint(..)
3530 , dropImagePrefix
3631 , CreateOpts(..)
37− , BuildOpts(..)
38− , defaultBuildOpts
3932 , defaultCreateOpts
4033 , DetachKeys(..)
4134 , StartOpts(..)
4235 , defaultStartOpts
43− , ContainerDeleteOpts(..)
44− , defaultContainerDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
36+ , DeleteOpts(..)
37+ , defaultDeleteOpts
4738 , Timestamp
4839 , TailLogOpt(..)
4940 , LogOpts(..)
5041 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
5342 , VolumePermission(..)
5443 , Bind(..)
5544 , Volume(..)
@@ -75,8 +64,6 @@ module Docker.Client.Types (
7564 , UTSMode(..)
7665 , HostConfig(..)
7766 , defaultHostConfig
78− , NetworkingConfig(..)
79− , EndpointConfig(..)
8067 , Ulimit(..)
8168 , ContainerResources(..)
8269 , defaultContainerResources
@@ -96,8 +83,6 @@ module Docker.Client.Types (
9683 , addLink
9784 , addVolume
9885 , addVolumeFrom
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
10186 ) where
10287
10388import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -108,11 +93,9 @@ import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
10893import Data.Char (isAlphaNum, toUpper)
10994import qualified Data.HashMap.Strict as HM
11095import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
11296import Data.Text (Text)
11397import qualified Data.Text as T
11498import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
11699import GHC.Generics (Generic)
117100import Prelude hiding (all, tail)
118101import Text.Read (readMaybe)
@@ -125,20 +108,14 @@ data Endpoint =
125108 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126109 | StartContainerEndpoint StartOpts ContainerID
127110 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129111 | KillContainerEndpoint Signal ContainerID
130112 | RestartContainerEndpoint Timeout ContainerID
131113 | PauseContainerEndpoint ContainerID
132114 | UnpauseContainerEndpoint ContainerID
133115 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134116 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
117+ | DeleteContainerEndpoint DeleteOpts ContainerID
136118 | InspectContainerEndpoint ContainerID
137− | BuildImageEndpoint BuildOpts FilePath
138− | 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
142119 deriving (Eq, Show)
143120
144121-- | We should newtype this
@@ -185,20 +162,6 @@ toImageID t =
185162-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186163data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
187164
188−data StatusCode = StatusCode Int
189−
190−instance ToJSON StatusCode where
191− toJSON (StatusCode c) = object ["StatusCode" .= c]
192−
193−instance FromJSON StatusCode where
194− parseJSON (JSON.Object o) = do
195− c <- o .: "StatusCode"
196− if c >= 0 && c <= 255 then
197− return (StatusCode c)
198− else
199− fail "Unknown exit code"
200− parseJSON _ = fail "Unknown exit code"
201−
202165-- TODO: Add more Signals or use an existing lib
203166-- | Signal used for sending to the process running in the container.
204167-- The default signal is SIGTERM.
@@ -213,16 +176,16 @@ data Signal = SIGHUP
213176
214177instance FromJSON Signal where
215178 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
179+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
180+ parseJSON (JSON.String "SIGINT") = return SIGINT
218181 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219182 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220183 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
184+ parseJSON _ = fail "Unknown Signal"
222185
223186instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
187+ toJSON SIGHUP = "SIGHUP"
188+ toJSON SIGINT = "SIGINT"
226189 toJSON SIGQUIT = "SIGQUIT"
227190 toJSON SIGSTOP = "SIGSTOP"
228191 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +213,7 @@ data ContainerDetails = ContainerDetails {
250213 , processLabel :: Text
251214 , resolveConfPath :: FilePath
252215 , restartCount :: Int
253− , containerDetailsState :: ContainerState
216+ , state :: ContainerState
254217 , mounts :: [Mount]
255218 }
256219 deriving (Eq, Show, Generic)
@@ -258,11 +221,11 @@ data ContainerDetails = ContainerDetails {
258221-- | Data type used for parsing the mount information from a container
259222-- list.
260223data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
224+ mountName :: Text
262225 , mountSource :: FilePath
263226 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
227+ , mountDriver :: Text
228+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266229 , mountRW :: Bool
267230 , mountPropogation :: Text
268231 }
@@ -270,14 +233,14 @@ data Mount = Mount {
270233
271234instance FromJSON Mount where
272235 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
236+ name <- o .: "Name"
274237 src <- o .: "Source"
275238 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
239+ driver <- o .: "Driver"
240+ mode <- o .: "Mode"
278241 rw <- o .: "RW"
279242 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
243+ return $ Mount name src dest driver mode rw prop
281244 parseJSON _ = fail "Mount is not an object"
282245
283246-- | Data type used for parsing the container state from a list of
@@ -293,7 +256,7 @@ data ContainerState = ContainerState {
293256 , restarting :: Bool
294257 , running :: Bool
295258 , startedAt :: UTCTime
296− , state :: State
259+ , status :: Status
297260 }
298261 deriving (Eq, Show, Generic)
299262
@@ -459,7 +422,7 @@ instance FromJSON NetworkOptions where
459422data Network = Network NetworkMode NetworkOptions
460423 deriving (Eq, Show)
461424
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
425+instance FromJSON [Network] where
463426 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
464427 where
465428 f accM k' v' = do
@@ -523,8 +486,7 @@ data Container = Container
523486 , containerImageId :: ImageID
524487 , containerCommand :: Text
525488 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
489+ , containerStatus :: Status
528490 , containerPorts :: [ContainerPortInfo]
529491 , containerLabels :: [Label]
530492 , containerNetworks :: [Network]
@@ -532,14 +494,13 @@ data Container = Container
532494 } deriving (Show, Eq)
533495
534496instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
497+ parseJSON (JSON.Object v) =
498+ Container <$> (v .: "Id")
537499 <*> (v .: "Names")
538500 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
501+ <*> (v .: "ImageID")
502+ <*> (v .: "Command")
541503 <*> (v .: "Created")
542− <*> (v .: "State")
543504 <*> (v .: "Status")
544505 <*> (v .: "Ports")
545506 <*> (v .: "Labels")
@@ -549,20 +510,21 @@ instance FromJSON Container where
549510 parseNetworks (JSON.Object v) =
550511 (v .: "Networks") >>= parseJSON
551512 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
513+
552514 parseJSON _ = fail "Container: Not a JSON object."
553515
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
516+-- | Represents the status of the container life cycle.
517+data Status = Created | Restarting | Running | Paused | Exited | Dead
556518 deriving (Eq, Show, Generic)
557519
558−instance FromJSON State where
559− parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
520+instance FromJSON Status where
521+ parseJSON (JSON.String "running") = return Running
522+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561523 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
524+ parseJSON (JSON.String "paused") = return Paused
525+ parseJSON (JSON.String "exited") = return Exited
526+ parseJSON (JSON.String "dead") = return Dead
527+ parseJSON _ = fail "Unknown Status"
566528
567529-- | Alias for representing a RepoDigest. We could newtype this and add
568530-- some validation.
@@ -574,13 +536,13 @@ data Label = Label Name Value deriving (Eq, Show)
574536
575537-- If there are multiple lables with the same Name in the list
576538-- then the last one wins.
577−instance {-# OVERLAPPING #-} ToJSON [Label] where
539+instance ToJSON [Label] where
578540 toJSON [] = emptyJsonObject
579541 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580542 where key (Label k _) = T.unpack k
581543 val (Label _ v) = v
582544
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
545+instance FromJSON [Label] where
584546 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585547 where f accM k v = do
586548 acc <- accM
@@ -597,8 +559,8 @@ data Image = DockerImage {
597559 imageId :: ImageID
598560 , imageCreated :: Integer
599561 , imageParentId :: Maybe ImageID
600− , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
562+ , imageRepoTags :: Maybe [Tag]
563+ , imageRepoDigests :: Maybe [Digest]
602564 , imageSize :: Integer
603565 , imageVirtualSize :: Integer
604566 , imageLabels :: [Label]
@@ -615,54 +577,30 @@ instance FromJSON Image where
615577 imageId <- o .: "Id"
616578 imageCreated <- o .: "Created"
617579 imageParentId <- o .:? "ParentId"
618− imageRepoTags <- o .:? "RepoTags" .!= []
619− imageRepoDigests <- o .:? "RepoDigests" .!= []
580+ imageRepoTags <- o .:? "RepoTags"
581+ imageRepoDigests <- o .:? "RepoDigests"
620582 imageSize <- o .: "Size"
621583 imageVirtualSize <- o .: "VirtualSize"
622− imageLabels <- o .:? "Labels" .!= []
584+ imageLabels <- case HM.lookup "Labels" o of
585+ Just ls -> parseJSON ls
586+ Nothing -> return []
623587 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624588 parseJSON _ = fail "Failed to parse DockerImage."
625589
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− ]
649590
650591-- | Options used for creating a Container.
651592data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
593+ containerConfig :: ContainerConfig
594+ , hostConfig :: HostConfig
655595 } deriving (Eq, Show)
656596
657597instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
598+ toJSON (CreateOpts cc hc) = do
659599 let ccJSON = toJSON cc
660600 let hcJSON = toJSON hc
661601 case ccJSON of
662602 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
603+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666604 _ -> error "ContainerConfig is not an object." -- This should never happen.
667605
668606-- | Container configuration used for creating a container with sensible
@@ -684,7 +622,7 @@ defaultContainerConfig imageName = ContainerConfig {
684622 , cmd=[]
685623 , volumes=[]
686624 , workingDir=Nothing
687− , entrypoint=Entrypoint []
625+ , entrypoint=Nothing
688626 , networkDisabled=Nothing
689627 , macAddress=Nothing
690628 , labels=[]
@@ -697,7 +635,7 @@ defaultHostConfig = HostConfig {
697635 binds=[]
698636 , containerIDFile=Nothing
699637 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
638+ , networkMode=Bridge
701639 , portBindings=[]
702640 , restartPolicy=RestartOff
703641 , volumeDriver=Nothing
@@ -737,18 +675,14 @@ defaultContainerResources = ContainerResources {
737675 , memory=Nothing
738676 , memoryReservation=Nothing
739677 , memorySwap=Nothing
740− , oomKillDisable=Just False
678+ , oomKillDisable=False
741679 , ulimits=[]
742680 }
743681
744682-- | Default create options when creating a container. You only need to
745683-- specify an image name and the rest is all sensible defaults.
746684defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
685+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752686
753687-- | Override the key sequence for detaching a container.
754688-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +696,16 @@ defaultStartOpts :: StartOpts
762696defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763697
764698-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
699+data DeleteOpts = DeleteOpts {
766700 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767701 , force :: Bool -- ^ If the container is still running force deletion anyway.
768702 } deriving (Eq, Show)
769703
770−-- TODO: Add support for container build constraints
771−-- | Options for when building images from a Dockerfile
772−data BuildOpts = BuildOpts {
773− buildImageName :: Text -- ^ Image name in the form of name:tag; ie. myimage:latest.:w
774− , buildDockerfileName :: Text -- ^ Name of dockerfile (default: Dockerfile)
775− , buildQuiet :: Bool
776− , buildNoCache :: Bool -- ^ Do not use cache when building the image.
777− , buildRemoveItermediate :: Bool -- ^ Remove intermediate containers after a successful build (default true).
778− , buildForceRemoveIntermediate :: Bool -- ^ Always remove intermediate containers.
779− , buildPullParent :: Bool -- ^ Always attempt to pull a newer version of the *parent* image (ie. FROM debian:jessie).
780− } deriving (Eq, Show)
781−
782−defaultBuildOpts :: Text -> BuildOpts
783−defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
784− , buildDockerfileName = "Dockerfile"
785− , buildQuiet = False
786− , buildNoCache = False
787− , buildRemoveItermediate = True
788− , buildForceRemoveIntermediate = False
789− , buildPullParent = False
790− }
791−
792704-- | Default options for deleting a container. Most of the time we DON'T
793705-- want to delete the container's volumes or force delete it if it's
794706-- 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
707+defaultDeleteOpts :: DeleteOpts
708+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804709
805710-- | Timestamp alias.
806711type Timestamp = Integer
@@ -828,50 +733,18 @@ defaultLogOpts = LogOpts { stdout = True
828733 , tail = All
829734 }
830735
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−
861736-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862737-- | Set permissions on volumes that you mount in the container.
863738data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864739
865740instance ToJSON VolumePermission where
866741 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
742+ toJSON ReadOnly = "ro"
868743
869744instance FromJSON VolumePermission where
870745 parseJSON "rw" = return ReadWrite
871746 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
747+ parseJSON _ = fail "Failed to parse VolumePermission"
875748
876749-- | Used for marking a directory in the container as "exposed" hence
877750-- taking it outside of the COW filesystem and making it mountable
@@ -886,15 +759,15 @@ instance FromJSON VolumePermission where
886759-- @
887760newtype Volume = Volume FilePath deriving (Eq, Show)
888761
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
762+instance ToJSON [Volume] where
890763 toJSON [] = emptyJsonObject
891764 toJSON (v:vs) = toJsonKey (v:vs) getKey
892765 where getKey (Volume v) = v
893766
894−instance {-# OVERLAPPING #-} FromJSON [Volume] where
767+instance FromJSON [Volume] where
895768 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
769+ parseJSON (JSON.Null) = return []
770+ parseJSON _ = fail "Volume is not an object"
898771
899772
900773data Bind = Bind { hostSrc :: Text
@@ -904,10 +777,10 @@ data Bind = Bind { hostSrc :: Text
904777
905778instance FromJSON Bind where
906779 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
780+ [src, dest] -> return $ Bind src dest Nothing
908781 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909782 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
783+ _ -> fail "Could not parse Bind"
911784 parseJSON _ = fail "Bind is not a string"
912785
913786data Device = Device {
@@ -930,15 +803,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930803
931804instance FromJSON VolumeFrom where
932805 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
806+ [vol] -> return $ VolumeFrom vol Nothing
934807 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935808 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
809+ _ -> fail "Could not parse VolumeFrom"
937810 parseJSON _ = fail "VolumeFrom is not a string"
938811
939812instance ToJSON VolumeFrom where
940813 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
814+ Nothing -> toJSON $ n <> ":" <> "rw"
942815 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943816
944817instance ToJSON Bind where
@@ -950,51 +823,51 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950823
951824instance FromJSON Link where
952825 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
826+ [f] -> return $ Link f Nothing
954827 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
828+ _ -> fail "Could not parse Link"
956829 parseJSON _ = fail "Link is not a string"
957830
958831instance ToJSON Link where
959832 toJSON (Link n1 n2) = toJSON $ case n2 of
960833 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
834+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962835
963836-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964837data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965838
966839instance FromJSON LogDriverType where
967840 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
841+ parseJSON (JSON.String "syslog") = return Syslog
842+ parseJSON (JSON.String "journald") = return Journald
843+ parseJSON (JSON.String "gelf") = return Gelf
844+ parseJSON (JSON.String "fluentd") = return Fluentd
845+ parseJSON (JSON.String "awslogs") = return AwsLogs
846+ parseJSON (JSON.String "splunk") = return Splunk
847+ parseJSON (JSON.String "etwlogs") = return Etwlogs
848+ parseJSON (JSON.String "none") = return LoggingDisabled
849+ parseJSON _ = fail "Unknown LogDriverType"
977850
978851instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
852+ toJSON JsonFile = JSON.String "json-file"
853+ toJSON Syslog = JSON.String "syslog"
854+ toJSON Journald = JSON.String "journald"
855+ toJSON Gelf = JSON.String "gelf"
856+ toJSON Fluentd = JSON.String "fluentd"
857+ toJSON AwsLogs = JSON.String "awslogs"
858+ toJSON Splunk = JSON.String "splunk"
859+ toJSON Etwlogs = JSON.String "etwlogs"
987860 toJSON LoggingDisabled = JSON.String "none"
988861
989862data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
990863
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
864+instance ToJSON [LogDriverOption] where
992865 toJSON [] = emptyJsonObject
993866 toJSON (o:os) = toJsonKeyVal (o:os) key val
994867 where key (LogDriverOption n _) = T.unpack n
995868 val (LogDriverOption _ v) = v
996869
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
870+instance FromJSON [LogDriverOption] where
998871 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999872 where f accM k v = do
1000873 acc <- accM
@@ -1017,41 +890,19 @@ instance FromJSON LogDriverConfig where
1017890 parseJSON _ = fail "LogDriverConfig is not an object"
1018891
1019892-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
893+data NetworkMode = Bridge | Host | NetworkDisabled
1021894 deriving (Eq, Show, Ord)
1022895
1023896instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
897+ parseJSON (JSON.String "bridge") = return Bridge
898+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
899+ parseJSON (JSON.String "none") = return NetworkDisabled
900+ parseJSON _ = fail "Unknown NetworkMode"
1029901
1030902instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
903+ toJSON Bridge = JSON.String "bridge"
904+ toJSON Host = JSON.String "host"
1033905 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]
1055906
1056907data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057908
@@ -1067,7 +918,7 @@ instance FromJSON PortType where
1067918 parseJSON val = case val of
1068919 "tcp" -> return TCP
1069920 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
921+ _ -> fail "PortType: Invalid port type."
1071922
1072923-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073924--
@@ -1148,7 +999,7 @@ addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1148999 oldeps = exposedPorts cc
11491000
11501001
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1002+instance FromJSON [PortBinding] where
11521003 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
11531004 where
11541005 f accM k v = case T.split (== '/') k of
@@ -1162,7 +1013,7 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
11621013 parseJSON (JSON.Null) = return []
11631014 parseJSON _ = fail "PortBindings is not an object"
11641015
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1016+instance ToJSON [PortBinding] where
11661017 toJSON [] = emptyJsonObject
11671018 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
11681019 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
@@ -1197,7 +1048,7 @@ instance FromJSON RestartPolicy where
11971048 "on-failure" -> do
11981049 retry <- o .: "MaximumRetryCount"
11991050 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1051+ "off" -> return RestartOff
12011052 _ -> fail "Could not parse RestartPolicy"
12021053 parseJSON _ = fail "RestartPolicy is not an object"
12031054
@@ -1205,7 +1056,7 @@ instance ToJSON RestartPolicy where
12051056 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
12061057 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
12071058 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1059+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
12091060
12101061data Isolation = Default | Process | Hyperv deriving (Eq, Show)
12111062
@@ -1378,22 +1229,6 @@ instance ToJSON DeviceRate where
13781229 , "Rate" .= r
13791230 ]
13801231
1381−data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1382−
1383−data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1384−
1385−instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1387− toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1388− toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1389−
1390−instance FromJSON MemoryConstraint where
1391− parseJSON (JSON.Number x) = case (floatingOrInteger x) of
1392− Left (_ :: Double) -> fail "Failed to parse MemoryConstraint"
1393− Right i -> return $ MemoryConstraint i B
1394− -- The docker daemon will always return the number as bytes (integer), regardless of how we set them (using MB or GB)
1395− parseJSON _ = fail "Failed to parse MemoryConstraint"
1396−
13971232data ContainerResources = ContainerResources {
13981233 cpuShares :: Maybe Integer
13991234 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1244,12 @@ data ContainerResources = ContainerResources {
14091244 , cpusetMems :: Maybe Text
14101245 , devices :: [Device]
14111246 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1413− , memory :: Maybe MemoryConstraint
1414− , memoryReservation :: Maybe MemoryConstraint
1415− , memorySwap :: Maybe MemoryConstraint
1247+ , kernelMemory :: Maybe Integer
1248+ , memory :: Maybe Integer
1249+ , memoryReservation :: Maybe Integer
1250+ , memorySwap :: Maybe Integer
14161251 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1252+ , oomKillDisable :: Bool
14181253 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191254 , ulimits :: [Ulimit]
14201255 -- TODO: Missing from 1.24
@@ -1452,7 +1287,7 @@ instance FromJSON EnvVar where
14521287 parseJSON _ = fail "EnvVar is not a string"
14531288
14541289instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1290+ toJSON (EnvVar n v) = object [n .= v]
14561291
14571292-- | ExposedPort represents a port (and it's type)
14581293-- that a container should expose to other containers or the host system.
@@ -1473,7 +1308,7 @@ instance ToJSON EnvVar where
14731308-- @
14741309data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
14751310
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1311+instance FromJSON [ExposedPort] where
14771312 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
14781313 where
14791314 f accM k _ = case T.split (== '/') k of
@@ -1486,27 +1321,12 @@ instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
14861321 parseJSON (JSON.Null) = return []
14871322 parseJSON _ = fail "ExposedPorts is not an object"
14881323
1489−instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1324+instance ToJSON [ExposedPort] where
14901325 toJSON [] = emptyJsonObject
14911326 toJSON (p:ps) = toJsonKey (p:ps) key
14921327 where key (ExposedPort p t) = show p <> slash <> show t
14931328 slash = T.unpack "/"
14941329
1495−data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1496−
1497−instance ToJSON Entrypoint where
1498− toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499− toJSON (Entrypoint []) = JSON.Null
1500−
1501−instance FromJSON Entrypoint where
1502− parseJSON (JSON.String e) = return $ Entrypoint [e]
1503− parseJSON (JSON.Array ar) = do
1504− arr <- mapM parseJSON (V.toList ar)
1505− return $ Entrypoint arr
1506− parseJSON JSON.Null = return $ Entrypoint []
1507− parseJSON _ = fail "Failed to parse Entrypoint"
1508−
1509−
15101330data ContainerConfig = ContainerConfig {
15111331 hostname :: Maybe Text
15121332 , domainname :: Maybe Text
@@ -1525,7 +1345,7 @@ data ContainerConfig = ContainerConfig {
15251345 , image :: Text
15261346 , volumes :: [Volume]
15271347 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1348+ , entrypoint :: Maybe Text -- Can be null?
15291349 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301350 , macAddress :: Maybe Text
15311351 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1353,6 @@ data ContainerConfig = ContainerConfig {
15331353 , stopSignal :: Signal
15341354 } deriving (Eq, Show, Generic)
15351355
1536−
15371356instance ToJSON ContainerConfig where
15381357 toJSON = genericToJSON defaultOptions {
15391358 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1546,7 +1365,9 @@ instance FromJSON ContainerConfig where
15461365 attachStdin <- o .: "AttachStdin"
15471366 attachStdout <- o .: "AttachStdout"
15481367 attachStderr <- o .: "AttachStderr"
1549− exposedPorts <- o .:? "ExposedPorts" .!= []
1368+ exposedPorts <- case HM.lookup "ExposedPorts" o of
1369+ Just eps -> parseJSON eps
1370+ Nothing -> return []
15501371 tty <- o .: "Tty"
15511372 openStdin <- o .: "OpenStdin"
15521373 stdinOnce <- o .: "StdinOnce"
@@ -1555,20 +1376,18 @@ instance FromJSON ContainerConfig where
15551376 image <- o .: "Image"
15561377 volumes <- o .: "Volumes"
15571378 workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1379+ entrypoint <- o .:? "Entrypoint"
15591380 networkDisabled <- o .:? "networkDisabled"
15601381 macAddress <- o .:? "MacAddress"
1561− labels <- o .:? "Labels" .!= []
1382+ labels <- case HM.lookup "Labels" o of
1383+ Just ls -> parseJSON ls
1384+ Nothing -> return []
15621385 stopSignal <- o .: "StopSignal"
15631386 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
15641387 macAddress labels stopSignal
15651388 parseJSON _ = fail "NetworkSettings is not an object."
15661389
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701390parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721391parseIntegerText t = case readMaybe $ T.unpack t of
15731392 Nothing ->
15741393 fail "Could not parse Integer"
@@ -1590,3 +1409,4 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
15901409-- | Helper function that return an empty dictionary "{}"
15911410emptyJsonObject :: JSON.Value
15921411emptyJsonObject = JSON.Object HM.empty
1412+