@@ -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
@@ -112,7 +99,6 @@ import Data.Scientific (floatingOrInteger)
11299import Data.Text (Text)
113100import qualified Data.Text as T
114101import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116102import GHC.Generics (Generic)
117103import Prelude hiding (all, tail)
118104import Text.Read (readMaybe)
@@ -125,20 +111,14 @@ data Endpoint =
125111 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126112 | StartContainerEndpoint StartOpts ContainerID
127113 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129114 | KillContainerEndpoint Signal ContainerID
130115 | RestartContainerEndpoint Timeout ContainerID
131116 | PauseContainerEndpoint ContainerID
132117 | UnpauseContainerEndpoint ContainerID
133118 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134119 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
120+ | DeleteContainerEndpoint DeleteOpts ContainerID
136121 | 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
142122 deriving (Eq, Show)
143123
144124-- | We should newtype this
@@ -185,20 +165,6 @@ toImageID t =
185165-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186166data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
187167
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−
202168-- TODO: Add more Signals or use an existing lib
203169-- | Signal used for sending to the process running in the container.
204170-- The default signal is SIGTERM.
@@ -213,16 +179,16 @@ data Signal = SIGHUP
213179
214180instance FromJSON Signal where
215181 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
182+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
183+ parseJSON (JSON.String "SIGINT") = return SIGINT
218184 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219185 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220186 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
187+ parseJSON _ = fail "Unknown Signal"
222188
223189instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
190+ toJSON SIGHUP = "SIGHUP"
191+ toJSON SIGINT = "SIGINT"
226192 toJSON SIGQUIT = "SIGQUIT"
227193 toJSON SIGSTOP = "SIGSTOP"
228194 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +216,7 @@ data ContainerDetails = ContainerDetails {
250216 , processLabel :: Text
251217 , resolveConfPath :: FilePath
252218 , restartCount :: Int
253− , containerDetailsState :: ContainerState
219+ , state :: ContainerState
254220 , mounts :: [Mount]
255221 }
256222 deriving (Eq, Show, Generic)
@@ -258,11 +224,11 @@ data ContainerDetails = ContainerDetails {
258224-- | Data type used for parsing the mount information from a container
259225-- list.
260226data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
227+ mountName :: Text
262228 , mountSource :: FilePath
263229 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
230+ , mountDriver :: Text
231+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266232 , mountRW :: Bool
267233 , mountPropogation :: Text
268234 }
@@ -270,14 +236,14 @@ data Mount = Mount {
270236
271237instance FromJSON Mount where
272238 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
239+ name <- o .: "Name"
274240 src <- o .: "Source"
275241 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
242+ driver <- o .: "Driver"
243+ mode <- o .: "Mode"
278244 rw <- o .: "RW"
279245 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
246+ return $ Mount name src dest driver mode rw prop
281247 parseJSON _ = fail "Mount is not an object"
282248
283249-- | Data type used for parsing the container state from a list of
@@ -293,7 +259,7 @@ data ContainerState = ContainerState {
293259 , restarting :: Bool
294260 , running :: Bool
295261 , startedAt :: UTCTime
296− , state :: State
262+ , status :: Status
297263 }
298264 deriving (Eq, Show, Generic)
299265
@@ -523,8 +489,7 @@ data Container = Container
523489 , containerImageId :: ImageID
524490 , containerCommand :: Text
525491 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
492+ , containerStatus :: Status
528493 , containerPorts :: [ContainerPortInfo]
529494 , containerLabels :: [Label]
530495 , containerNetworks :: [Network]
@@ -532,14 +497,13 @@ data Container = Container
532497 } deriving (Show, Eq)
533498
534499instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
500+ parseJSON (JSON.Object v) =
501+ Container <$> (v .: "Id")
537502 <*> (v .: "Names")
538503 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
504+ <*> (v .: "ImageID")
505+ <*> (v .: "Command")
541506 <*> (v .: "Created")
542− <*> (v .: "State")
543507 <*> (v .: "Status")
544508 <*> (v .: "Ports")
545509 <*> (v .: "Labels")
@@ -549,20 +513,21 @@ instance FromJSON Container where
549513 parseNetworks (JSON.Object v) =
550514 (v .: "Networks") >>= parseJSON
551515 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
516+
552517 parseJSON _ = fail "Container: Not a JSON object."
553518
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
519+-- | Represents the status of the container life cycle.
520+data Status = Created | Restarting | Running | Paused | Exited | Dead
556521 deriving (Eq, Show, Generic)
557522
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.
523+instance FromJSON Status where
524+ parseJSON (JSON.String "running") = return Running
525+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561526 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
527+ parseJSON (JSON.String "paused") = return Paused
528+ parseJSON (JSON.String "exited") = return Exited
529+ parseJSON (JSON.String "dead") = return Dead
530+ parseJSON _ = fail "Unknown Status"
566531
567532-- | Alias for representing a RepoDigest. We could newtype this and add
568533-- some validation.
@@ -623,46 +588,20 @@ instance FromJSON Image where
623588 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624589 parseJSON _ = fail "Failed to parse DockerImage."
625590
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− ]
649591
650592-- | Options used for creating a Container.
651593data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
594+ containerConfig :: ContainerConfig
595+ , hostConfig :: HostConfig
655596 } deriving (Eq, Show)
656597
657598instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
599+ toJSON (CreateOpts cc hc) = do
659600 let ccJSON = toJSON cc
660601 let hcJSON = toJSON hc
661602 case ccJSON of
662603 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
604+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666605 _ -> error "ContainerConfig is not an object." -- This should never happen.
667606
668607-- | Container configuration used for creating a container with sensible
@@ -684,7 +623,7 @@ defaultContainerConfig imageName = ContainerConfig {
684623 , cmd=[]
685624 , volumes=[]
686625 , workingDir=Nothing
687− , entrypoint=Entrypoint []
626+ , entrypoint=Nothing
688627 , networkDisabled=Nothing
689628 , macAddress=Nothing
690629 , labels=[]
@@ -697,7 +636,7 @@ defaultHostConfig = HostConfig {
697636 binds=[]
698637 , containerIDFile=Nothing
699638 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
639+ , networkMode=Bridge
701640 , portBindings=[]
702641 , restartPolicy=RestartOff
703642 , volumeDriver=Nothing
@@ -737,18 +676,14 @@ defaultContainerResources = ContainerResources {
737676 , memory=Nothing
738677 , memoryReservation=Nothing
739678 , memorySwap=Nothing
740− , oomKillDisable=Just False
679+ , oomKillDisable=False
741680 , ulimits=[]
742681 }
743682
744683-- | Default create options when creating a container. You only need to
745684-- specify an image name and the rest is all sensible defaults.
746685defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
686+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752687
753688-- | Override the key sequence for detaching a container.
754689-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +697,16 @@ defaultStartOpts :: StartOpts
762697defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763698
764699-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
700+data DeleteOpts = DeleteOpts {
766701 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767702 , force :: Bool -- ^ If the container is still running force deletion anyway.
768703 } deriving (Eq, Show)
769704
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−
792705-- | Default options for deleting a container. Most of the time we DON'T
793706-- want to delete the container's volumes or force delete it if it's
794707-- 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
708+defaultDeleteOpts :: DeleteOpts
709+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804710
805711-- | Timestamp alias.
806712type Timestamp = Integer
@@ -828,50 +734,18 @@ defaultLogOpts = LogOpts { stdout = True
828734 , tail = All
829735 }
830736
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−
861737-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862738-- | Set permissions on volumes that you mount in the container.
863739data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864740
865741instance ToJSON VolumePermission where
866742 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
743+ toJSON ReadOnly = "ro"
868744
869745instance FromJSON VolumePermission where
870746 parseJSON "rw" = return ReadWrite
871747 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
748+ parseJSON _ = fail "Failed to parse VolumePermission"
875749
876750-- | Used for marking a directory in the container as "exposed" hence
877751-- taking it outside of the COW filesystem and making it mountable
@@ -893,8 +767,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
893767
894768instance {-# OVERLAPPING #-} FromJSON [Volume] where
895769 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"
770+ parseJSON (JSON.Null) = return []
771+ parseJSON _ = fail "Volume is not an object"
898772
899773
900774data Bind = Bind { hostSrc :: Text
@@ -904,10 +778,10 @@ data Bind = Bind { hostSrc :: Text
904778
905779instance FromJSON Bind where
906780 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
781+ [src, dest] -> return $ Bind src dest Nothing
908782 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909783 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
784+ _ -> fail "Could not parse Bind"
911785 parseJSON _ = fail "Bind is not a string"
912786
913787data Device = Device {
@@ -930,15 +804,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930804
931805instance FromJSON VolumeFrom where
932806 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
807+ [vol] -> return $ VolumeFrom vol Nothing
934808 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935809 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
810+ _ -> fail "Could not parse VolumeFrom"
937811 parseJSON _ = fail "VolumeFrom is not a string"
938812
939813instance ToJSON VolumeFrom where
940814 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
815+ Nothing -> toJSON $ n <> ":" <> "rw"
942816 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943817
944818instance ToJSON Bind where
@@ -950,40 +824,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950824
951825instance FromJSON Link where
952826 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
827+ [f] -> return $ Link f Nothing
954828 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
829+ _ -> fail "Could not parse Link"
956830 parseJSON _ = fail "Link is not a string"
957831
958832instance ToJSON Link where
959833 toJSON (Link n1 n2) = toJSON $ case n2 of
960834 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
835+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962836
963837-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964838data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965839
966840instance FromJSON LogDriverType where
967841 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"
842+ parseJSON (JSON.String "syslog") = return Syslog
843+ parseJSON (JSON.String "journald") = return Journald
844+ parseJSON (JSON.String "gelf") = return Gelf
845+ parseJSON (JSON.String "fluentd") = return Fluentd
846+ parseJSON (JSON.String "awslogs") = return AwsLogs
847+ parseJSON (JSON.String "splunk") = return Splunk
848+ parseJSON (JSON.String "etwlogs") = return Etwlogs
849+ parseJSON (JSON.String "none") = return LoggingDisabled
850+ parseJSON _ = fail "Unknown LogDriverType"
977851
978852instance 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"
853+ toJSON JsonFile = JSON.String "json-file"
854+ toJSON Syslog = JSON.String "syslog"
855+ toJSON Journald = JSON.String "journald"
856+ toJSON Gelf = JSON.String "gelf"
857+ toJSON Fluentd = JSON.String "fluentd"
858+ toJSON AwsLogs = JSON.String "awslogs"
859+ toJSON Splunk = JSON.String "splunk"
860+ toJSON Etwlogs = JSON.String "etwlogs"
987861 toJSON LoggingDisabled = JSON.String "none"
988862
989863data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -1017,41 +891,19 @@ instance FromJSON LogDriverConfig where
1017891 parseJSON _ = fail "LogDriverConfig is not an object"
1018892
1019893-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
894+data NetworkMode = Bridge | Host | NetworkDisabled
1021895 deriving (Eq, Show, Ord)
1022896
1023897instance 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"
898+ parseJSON (JSON.String "bridge") = return Bridge
899+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
900+ parseJSON (JSON.String "none") = return NetworkDisabled
901+ parseJSON _ = fail "Unknown NetworkMode"
1029902
1030903instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
904+ toJSON Bridge = JSON.String "bridge"
905+ toJSON Host = JSON.String "host"
1033906 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]
1055907
1056908data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057909
@@ -1067,7 +919,7 @@ instance FromJSON PortType where
1067919 parseJSON val = case val of
1068920 "tcp" -> return TCP
1069921 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
922+ _ -> fail "PortType: Invalid port type."
1071923
1072924-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073925--
@@ -1197,7 +1049,7 @@ instance FromJSON RestartPolicy where
11971049 "on-failure" -> do
11981050 retry <- o .: "MaximumRetryCount"
11991051 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1052+ "off" -> return RestartOff
12011053 _ -> fail "Could not parse RestartPolicy"
12021054 parseJSON _ = fail "RestartPolicy is not an object"
12031055
@@ -1205,7 +1057,7 @@ instance ToJSON RestartPolicy where
12051057 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
12061058 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
12071059 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1060+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
12091061
12101062data Isolation = Default | Process | Hyperv deriving (Eq, Show)
12111063
@@ -1383,7 +1235,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
13831235data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
13841236
13851237instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1238+ toJSON (MemoryConstraint x B) = toJSON x
13871239 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
13881240 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
13891241
@@ -1414,7 +1266,7 @@ data ContainerResources = ContainerResources {
14141266 , memoryReservation :: Maybe MemoryConstraint
14151267 , memorySwap :: Maybe MemoryConstraint
14161268 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1269+ , oomKillDisable :: Bool
14181270 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191271 , ulimits :: [Ulimit]
14201272 -- TODO: Missing from 1.24
@@ -1452,7 +1304,7 @@ instance FromJSON EnvVar where
14521304 parseJSON _ = fail "EnvVar is not a string"
14531305
14541306instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1307+ toJSON (EnvVar n v) = object [n .= v]
14561308
14571309-- | ExposedPort represents a port (and it's type)
14581310-- that a container should expose to other containers or the host system.
@@ -1492,21 +1344,6 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
14921344 where key (ExposedPort p t) = show p <> slash <> show t
14931345 slash = T.unpack "/"
14941346
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−
15101347data ContainerConfig = ContainerConfig {
15111348 hostname :: Maybe Text
15121349 , domainname :: Maybe Text
@@ -1525,7 +1362,7 @@ data ContainerConfig = ContainerConfig {
15251362 , image :: Text
15261363 , volumes :: [Volume]
15271364 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1365+ , entrypoint :: Maybe Text -- Can be null?
15291366 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301367 , macAddress :: Maybe Text
15311368 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1370,6 @@ data ContainerConfig = ContainerConfig {
15331370 , stopSignal :: Signal
15341371 } deriving (Eq, Show, Generic)
15351372
1536−
15371373instance ToJSON ContainerConfig where
15381374 toJSON = genericToJSON defaultOptions {
15391375 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1555,7 +1391,7 @@ instance FromJSON ContainerConfig where
15551391 image <- o .: "Image"
15561392 volumes <- o .: "Volumes"
15571393 workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1394+ entrypoint <- o .:? "Entrypoint"
15591395 networkDisabled <- o .:? "networkDisabled"
15601396 macAddress <- o .:? "MacAddress"
15611397 labels <- o .:? "Labels" .!= []
@@ -1564,11 +1400,7 @@ instance FromJSON ContainerConfig where
15641400 macAddress labels stopSignal
15651401 parseJSON _ = fail "NetworkSettings is not an object."
15661402
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701403parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721404parseIntegerText t = case readMaybe $ T.unpack t of
15731405 Nothing ->
15741406 fail "Could not parse Integer"
@@ -1590,3 +1422,4 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
15901422-- | Helper function that return an empty dictionary "{}"
15911423emptyJsonObject :: JSON.Value
15921424emptyJsonObject = JSON.Object HM.empty
1425+