@@ -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,12 +23,11 @@ module Docker.Client.Types (
2623 , ContainerPortInfo(..)
2724 , Container(..)
2825 , ContainerState(..)
29− , State(..)
26+ , Status(..)
3027 , Digest
3128 , Label(..)
3229 , Tag
3330 , Image(..)
34− , Entrypoint(..)
3531 , dropImagePrefix
3632 , CreateOpts(..)
3733 , BuildOpts(..)
@@ -40,16 +36,12 @@ module Docker.Client.Types (
4036 , DetachKeys(..)
4137 , StartOpts(..)
4238 , defaultStartOpts
43− , ContainerDeleteOpts(..)
44− , defaultContainerDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
39+ , DeleteOpts(..)
40+ , defaultDeleteOpts
4741 , Timestamp
4842 , TailLogOpt(..)
4943 , LogOpts(..)
5044 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
5345 , VolumePermission(..)
5446 , Bind(..)
5547 , Volume(..)
@@ -75,8 +67,6 @@ module Docker.Client.Types (
7567 , UTSMode(..)
7668 , HostConfig(..)
7769 , defaultHostConfig
78− , NetworkingConfig(..)
79− , EndpointConfig(..)
8070 , Ulimit(..)
8171 , ContainerResources(..)
8272 , defaultContainerResources
@@ -112,7 +102,6 @@ import Data.Scientific (floatingOrInteger)
112102import Data.Text (Text)
113103import qualified Data.Text as T
114104import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116105import GHC.Generics (Generic)
117106import Prelude hiding (all, tail)
118107import Text.Read (readMaybe)
@@ -132,13 +121,9 @@ data Endpoint =
132121 | UnpauseContainerEndpoint ContainerID
133122 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134123 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
124+ | DeleteContainerEndpoint DeleteOpts ContainerID
136125 | InspectContainerEndpoint ContainerID
137126 | 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
142127 deriving (Eq, Show)
143128
144129-- | We should newtype this
@@ -213,16 +198,16 @@ data Signal = SIGHUP
213198
214199instance FromJSON Signal where
215200 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
201+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
202+ parseJSON (JSON.String "SIGINT") = return SIGINT
218203 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219204 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220205 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
206+ parseJSON _ = fail "Unknown Signal"
222207
223208instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
209+ toJSON SIGHUP = "SIGHUP"
210+ toJSON SIGINT = "SIGINT"
226211 toJSON SIGQUIT = "SIGQUIT"
227212 toJSON SIGSTOP = "SIGSTOP"
228213 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +235,7 @@ data ContainerDetails = ContainerDetails {
250235 , processLabel :: Text
251236 , resolveConfPath :: FilePath
252237 , restartCount :: Int
253− , containerDetailsState :: ContainerState
238+ , state :: ContainerState
254239 , mounts :: [Mount]
255240 }
256241 deriving (Eq, Show, Generic)
@@ -258,11 +243,11 @@ data ContainerDetails = ContainerDetails {
258243-- | Data type used for parsing the mount information from a container
259244-- list.
260245data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
246+ mountName :: Text
262247 , mountSource :: FilePath
263248 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
249+ , mountDriver :: Text
250+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266251 , mountRW :: Bool
267252 , mountPropogation :: Text
268253 }
@@ -270,14 +255,14 @@ data Mount = Mount {
270255
271256instance FromJSON Mount where
272257 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
258+ name <- o .: "Name"
274259 src <- o .: "Source"
275260 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
261+ driver <- o .: "Driver"
262+ mode <- o .: "Mode"
278263 rw <- o .: "RW"
279264 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
265+ return $ Mount name src dest driver mode rw prop
281266 parseJSON _ = fail "Mount is not an object"
282267
283268-- | Data type used for parsing the container state from a list of
@@ -293,7 +278,7 @@ data ContainerState = ContainerState {
293278 , restarting :: Bool
294279 , running :: Bool
295280 , startedAt :: UTCTime
296− , state :: State
281+ , status :: Status
297282 }
298283 deriving (Eq, Show, Generic)
299284
@@ -523,8 +508,7 @@ data Container = Container
523508 , containerImageId :: ImageID
524509 , containerCommand :: Text
525510 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
511+ , containerStatus :: Status
528512 , containerPorts :: [ContainerPortInfo]
529513 , containerLabels :: [Label]
530514 , containerNetworks :: [Network]
@@ -532,14 +516,13 @@ data Container = Container
532516 } deriving (Show, Eq)
533517
534518instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
519+ parseJSON (JSON.Object v) =
520+ Container <$> (v .: "Id")
537521 <*> (v .: "Names")
538522 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
523+ <*> (v .: "ImageID")
524+ <*> (v .: "Command")
541525 <*> (v .: "Created")
542− <*> (v .: "State")
543526 <*> (v .: "Status")
544527 <*> (v .: "Ports")
545528 <*> (v .: "Labels")
@@ -549,20 +532,21 @@ instance FromJSON Container where
549532 parseNetworks (JSON.Object v) =
550533 (v .: "Networks") >>= parseJSON
551534 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
535+
552536 parseJSON _ = fail "Container: Not a JSON object."
553537
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
538+-- | Represents the status of the container life cycle.
539+data Status = Created | Restarting | Running | Paused | Exited | Dead
556540 deriving (Eq, Show, Generic)
557541
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.
542+instance FromJSON Status where
543+ parseJSON (JSON.String "running") = return Running
544+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561545 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
546+ parseJSON (JSON.String "paused") = return Paused
547+ parseJSON (JSON.String "exited") = return Exited
548+ parseJSON (JSON.String "dead") = return Dead
549+ parseJSON _ = fail "Unknown Status"
566550
567551-- | Alias for representing a RepoDigest. We could newtype this and add
568552-- some validation.
@@ -623,46 +607,20 @@ instance FromJSON Image where
623607 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624608 parseJSON _ = fail "Failed to parse DockerImage."
625609
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− ]
649610
650611-- | Options used for creating a Container.
651612data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
613+ containerConfig :: ContainerConfig
614+ , hostConfig :: HostConfig
655615 } deriving (Eq, Show)
656616
657617instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
618+ toJSON (CreateOpts cc hc) = do
659619 let ccJSON = toJSON cc
660620 let hcJSON = toJSON hc
661621 case ccJSON of
662622 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
623+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666624 _ -> error "ContainerConfig is not an object." -- This should never happen.
667625
668626-- | Container configuration used for creating a container with sensible
@@ -684,7 +642,7 @@ defaultContainerConfig imageName = ContainerConfig {
684642 , cmd=[]
685643 , volumes=[]
686644 , workingDir=Nothing
687− , entrypoint=Entrypoint []
645+ , entrypoint=Nothing
688646 , networkDisabled=Nothing
689647 , macAddress=Nothing
690648 , labels=[]
@@ -697,7 +655,7 @@ defaultHostConfig = HostConfig {
697655 binds=[]
698656 , containerIDFile=Nothing
699657 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
658+ , networkMode=Bridge
701659 , portBindings=[]
702660 , restartPolicy=RestartOff
703661 , volumeDriver=Nothing
@@ -737,18 +695,14 @@ defaultContainerResources = ContainerResources {
737695 , memory=Nothing
738696 , memoryReservation=Nothing
739697 , memorySwap=Nothing
740− , oomKillDisable=Just False
698+ , oomKillDisable=False
741699 , ulimits=[]
742700 }
743701
744702-- | Default create options when creating a container. You only need to
745703-- specify an image name and the rest is all sensible defaults.
746704defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
705+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752706
753707-- | Override the key sequence for detaching a container.
754708-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,7 +716,7 @@ defaultStartOpts :: StartOpts
762716defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763717
764718-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
719+data DeleteOpts = DeleteOpts {
766720 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767721 , force :: Bool -- ^ If the container is still running force deletion anyway.
768722 } deriving (Eq, Show)
@@ -792,15 +746,8 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
792746-- | Default options for deleting a container. Most of the time we DON'T
793747-- want to delete the container's volumes or force delete it if it's
794748-- 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
749+defaultDeleteOpts :: DeleteOpts
750+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804751
805752-- | Timestamp alias.
806753type Timestamp = Integer
@@ -828,50 +775,18 @@ defaultLogOpts = LogOpts { stdout = True
828775 , tail = All
829776 }
830777
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−
861778-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862779-- | Set permissions on volumes that you mount in the container.
863780data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864781
865782instance ToJSON VolumePermission where
866783 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
784+ toJSON ReadOnly = "ro"
868785
869786instance FromJSON VolumePermission where
870787 parseJSON "rw" = return ReadWrite
871788 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
789+ parseJSON _ = fail "Failed to parse VolumePermission"
875790
876791-- | Used for marking a directory in the container as "exposed" hence
877792-- taking it outside of the COW filesystem and making it mountable
@@ -893,8 +808,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
893808
894809instance {-# OVERLAPPING #-} FromJSON [Volume] where
895810 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"
811+ parseJSON (JSON.Null) = return []
812+ parseJSON _ = fail "Volume is not an object"
898813
899814
900815data Bind = Bind { hostSrc :: Text
@@ -904,10 +819,10 @@ data Bind = Bind { hostSrc :: Text
904819
905820instance FromJSON Bind where
906821 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
822+ [src, dest] -> return $ Bind src dest Nothing
908823 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909824 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
825+ _ -> fail "Could not parse Bind"
911826 parseJSON _ = fail "Bind is not a string"
912827
913828data Device = Device {
@@ -930,15 +845,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930845
931846instance FromJSON VolumeFrom where
932847 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
848+ [vol] -> return $ VolumeFrom vol Nothing
934849 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935850 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
851+ _ -> fail "Could not parse VolumeFrom"
937852 parseJSON _ = fail "VolumeFrom is not a string"
938853
939854instance ToJSON VolumeFrom where
940855 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
856+ Nothing -> toJSON $ n <> ":" <> "rw"
942857 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943858
944859instance ToJSON Bind where
@@ -950,40 +865,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950865
951866instance FromJSON Link where
952867 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
868+ [f] -> return $ Link f Nothing
954869 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
870+ _ -> fail "Could not parse Link"
956871 parseJSON _ = fail "Link is not a string"
957872
958873instance ToJSON Link where
959874 toJSON (Link n1 n2) = toJSON $ case n2 of
960875 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
876+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962877
963878-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964879data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965880
966881instance FromJSON LogDriverType where
967882 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"
883+ parseJSON (JSON.String "syslog") = return Syslog
884+ parseJSON (JSON.String "journald") = return Journald
885+ parseJSON (JSON.String "gelf") = return Gelf
886+ parseJSON (JSON.String "fluentd") = return Fluentd
887+ parseJSON (JSON.String "awslogs") = return AwsLogs
888+ parseJSON (JSON.String "splunk") = return Splunk
889+ parseJSON (JSON.String "etwlogs") = return Etwlogs
890+ parseJSON (JSON.String "none") = return LoggingDisabled
891+ parseJSON _ = fail "Unknown LogDriverType"
977892
978893instance 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"
894+ toJSON JsonFile = JSON.String "json-file"
895+ toJSON Syslog = JSON.String "syslog"
896+ toJSON Journald = JSON.String "journald"
897+ toJSON Gelf = JSON.String "gelf"
898+ toJSON Fluentd = JSON.String "fluentd"
899+ toJSON AwsLogs = JSON.String "awslogs"
900+ toJSON Splunk = JSON.String "splunk"
901+ toJSON Etwlogs = JSON.String "etwlogs"
987902 toJSON LoggingDisabled = JSON.String "none"
988903
989904data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -1017,41 +932,19 @@ instance FromJSON LogDriverConfig where
1017932 parseJSON _ = fail "LogDriverConfig is not an object"
1018933
1019934-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
935+data NetworkMode = Bridge | Host | NetworkDisabled
1021936 deriving (Eq, Show, Ord)
1022937
1023938instance 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"
939+ parseJSON (JSON.String "bridge") = return Bridge
940+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
941+ parseJSON (JSON.String "none") = return NetworkDisabled
942+ parseJSON _ = fail "Unknown NetworkMode"
1029943
1030944instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
945+ toJSON Bridge = JSON.String "bridge"
946+ toJSON Host = JSON.String "host"
1033947 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]
1055948
1056949data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057950
@@ -1067,7 +960,7 @@ instance FromJSON PortType where
1067960 parseJSON val = case val of
1068961 "tcp" -> return TCP
1069962 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
963+ _ -> fail "PortType: Invalid port type."
1071964
1072965-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073966--
@@ -1197,7 +1090,7 @@ instance FromJSON RestartPolicy where
11971090 "on-failure" -> do
11981091 retry <- o .: "MaximumRetryCount"
11991092 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1093+ "off" -> return RestartOff
12011094 _ -> fail "Could not parse RestartPolicy"
12021095 parseJSON _ = fail "RestartPolicy is not an object"
12031096
@@ -1205,7 +1098,7 @@ instance ToJSON RestartPolicy where
12051098 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
12061099 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
12071100 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1101+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
12091102
12101103data Isolation = Default | Process | Hyperv deriving (Eq, Show)
12111104
@@ -1383,7 +1276,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
13831276data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
13841277
13851278instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1279+ toJSON (MemoryConstraint x B) = toJSON x
13871280 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
13881281 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
13891282
@@ -1414,7 +1307,7 @@ data ContainerResources = ContainerResources {
14141307 , memoryReservation :: Maybe MemoryConstraint
14151308 , memorySwap :: Maybe MemoryConstraint
14161309 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1310+ , oomKillDisable :: Bool
14181311 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191312 , ulimits :: [Ulimit]
14201313 -- TODO: Missing from 1.24
@@ -1452,7 +1345,7 @@ instance FromJSON EnvVar where
14521345 parseJSON _ = fail "EnvVar is not a string"
14531346
14541347instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1348+ toJSON (EnvVar n v) = object [n .= v]
14561349
14571350-- | ExposedPort represents a port (and it's type)
14581351-- that a container should expose to other containers or the host system.
@@ -1492,21 +1385,6 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
14921385 where key (ExposedPort p t) = show p <> slash <> show t
14931386 slash = T.unpack "/"
14941387
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−
15101388data ContainerConfig = ContainerConfig {
15111389 hostname :: Maybe Text
15121390 , domainname :: Maybe Text
@@ -1525,7 +1403,7 @@ data ContainerConfig = ContainerConfig {
15251403 , image :: Text
15261404 , volumes :: [Volume]
15271405 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1406+ , entrypoint :: Maybe Text -- Can be null?
15291407 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301408 , macAddress :: Maybe Text
15311409 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1411,6 @@ data ContainerConfig = ContainerConfig {
15331411 , stopSignal :: Signal
15341412 } deriving (Eq, Show, Generic)
15351413
1536−
15371414instance ToJSON ContainerConfig where
15381415 toJSON = genericToJSON defaultOptions {
15391416 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1555,7 +1432,7 @@ instance FromJSON ContainerConfig where
15551432 image <- o .: "Image"
15561433 volumes <- o .: "Volumes"
15571434 workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1435+ entrypoint <- o .:? "Entrypoint"
15591436 networkDisabled <- o .:? "networkDisabled"
15601437 macAddress <- o .:? "MacAddress"
15611438 labels <- o .:? "Labels" .!= []
@@ -1564,11 +1441,7 @@ instance FromJSON ContainerConfig where
15641441 macAddress labels stopSignal
15651442 parseJSON _ = fail "NetworkSettings is not an object."
15661443
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701444parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721445parseIntegerText t = case readMaybe $ T.unpack t of
15731446 Nothing ->
15741447 fail "Could not parse Integer"
@@ -1590,3 +1463,4 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
15901463-- | Helper function that return an empty dictionary "{}"
15911464emptyJsonObject :: JSON.Value
15921465emptyJsonObject = JSON.Object HM.empty
1466+