@@ -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
@@ -106,13 +93,13 @@ import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
10693import qualified Data.Aeson as JSON
10794import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
10895import Data.Char (isAlphaNum, toUpper)
96+import Data.Foldable (asum)
10997import qualified Data.HashMap.Strict as HM
11098import Data.Monoid ((<>))
11199import Data.Scientific (floatingOrInteger)
112100import Data.Text (Text)
113101import qualified Data.Text as T
114102import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116103import GHC.Generics (Generic)
117104import Prelude hiding (all, tail)
118105import Text.Read (readMaybe)
@@ -125,20 +112,14 @@ data Endpoint =
125112 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126113 | StartContainerEndpoint StartOpts ContainerID
127114 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129115 | KillContainerEndpoint Signal ContainerID
130116 | RestartContainerEndpoint Timeout ContainerID
131117 | PauseContainerEndpoint ContainerID
132118 | UnpauseContainerEndpoint ContainerID
133119 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134120 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
121+ | DeleteContainerEndpoint DeleteOpts ContainerID
136122 | 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
142123 deriving (Eq, Show)
143124
144125-- | We should newtype this
@@ -185,20 +166,6 @@ toImageID t =
185166-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186167data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
187168
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−
202169-- TODO: Add more Signals or use an existing lib
203170-- | Signal used for sending to the process running in the container.
204171-- The default signal is SIGTERM.
@@ -213,16 +180,16 @@ data Signal = SIGHUP
213180
214181instance FromJSON Signal where
215182 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
183+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
184+ parseJSON (JSON.String "SIGINT") = return SIGINT
218185 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219186 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220187 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
188+ parseJSON _ = fail "Unknown Signal"
222189
223190instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
191+ toJSON SIGHUP = "SIGHUP"
192+ toJSON SIGINT = "SIGINT"
226193 toJSON SIGQUIT = "SIGQUIT"
227194 toJSON SIGSTOP = "SIGSTOP"
228195 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +217,7 @@ data ContainerDetails = ContainerDetails {
250217 , processLabel :: Text
251218 , resolveConfPath :: FilePath
252219 , restartCount :: Int
253− , containerDetailsState :: ContainerState
220+ , state :: ContainerState
254221 , mounts :: [Mount]
255222 }
256223 deriving (Eq, Show, Generic)
@@ -258,11 +225,11 @@ data ContainerDetails = ContainerDetails {
258225-- | Data type used for parsing the mount information from a container
259226-- list.
260227data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
228+ mountName :: Text
262229 , mountSource :: FilePath
263230 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
231+ , mountDriver :: Text
232+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266233 , mountRW :: Bool
267234 , mountPropogation :: Text
268235 }
@@ -270,14 +237,14 @@ data Mount = Mount {
270237
271238instance FromJSON Mount where
272239 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
240+ name <- o .: "Name"
274241 src <- o .: "Source"
275242 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
243+ driver <- o .: "Driver"
244+ mode <- o .: "Mode"
278245 rw <- o .: "RW"
279246 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
247+ return $ Mount name src dest driver mode rw prop
281248 parseJSON _ = fail "Mount is not an object"
282249
283250-- | Data type used for parsing the container state from a list of
@@ -293,7 +260,7 @@ data ContainerState = ContainerState {
293260 , restarting :: Bool
294261 , running :: Bool
295262 , startedAt :: UTCTime
296− , state :: State
263+ , status :: Status
297264 }
298265 deriving (Eq, Show, Generic)
299266
@@ -523,8 +490,7 @@ data Container = Container
523490 , containerImageId :: ImageID
524491 , containerCommand :: Text
525492 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
493+ , containerStatus :: Status
528494 , containerPorts :: [ContainerPortInfo]
529495 , containerLabels :: [Label]
530496 , containerNetworks :: [Network]
@@ -532,14 +498,13 @@ data Container = Container
532498 } deriving (Show, Eq)
533499
534500instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
501+ parseJSON (JSON.Object v) =
502+ Container <$> (v .: "Id")
537503 <*> (v .: "Names")
538504 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
505+ <*> (v .: "ImageID")
506+ <*> (v .: "Command")
541507 <*> (v .: "Created")
542− <*> (v .: "State")
543508 <*> (v .: "Status")
544509 <*> (v .: "Ports")
545510 <*> (v .: "Labels")
@@ -549,20 +514,21 @@ instance FromJSON Container where
549514 parseNetworks (JSON.Object v) =
550515 (v .: "Networks") >>= parseJSON
551516 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
517+
552518 parseJSON _ = fail "Container: Not a JSON object."
553519
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
520+-- | Represents the status of the container life cycle.
521+data Status = Created | Restarting | Running | Paused | Exited | Dead
556522 deriving (Eq, Show, Generic)
557523
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.
524+instance FromJSON Status where
525+ parseJSON (JSON.String "running") = return Running
526+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561527 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
528+ parseJSON (JSON.String "paused") = return Paused
529+ parseJSON (JSON.String "exited") = return Exited
530+ parseJSON (JSON.String "dead") = return Dead
531+ parseJSON _ = fail "Unknown Status"
566532
567533-- | Alias for representing a RepoDigest. We could newtype this and add
568534-- some validation.
@@ -623,46 +589,20 @@ instance FromJSON Image where
623589 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624590 parseJSON _ = fail "Failed to parse DockerImage."
625591
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− ]
649592
650593-- | Options used for creating a Container.
651594data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
595+ containerConfig :: ContainerConfig
596+ , hostConfig :: HostConfig
655597 } deriving (Eq, Show)
656598
657599instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
600+ toJSON (CreateOpts cc hc) = do
659601 let ccJSON = toJSON cc
660602 let hcJSON = toJSON hc
661603 case ccJSON of
662604 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
605+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666606 _ -> error "ContainerConfig is not an object." -- This should never happen.
667607
668608-- | Container configuration used for creating a container with sensible
@@ -684,7 +624,7 @@ defaultContainerConfig imageName = ContainerConfig {
684624 , cmd=[]
685625 , volumes=[]
686626 , workingDir=Nothing
687− , entrypoint=Entrypoint []
627+ , entrypoint=[]
688628 , networkDisabled=Nothing
689629 , macAddress=Nothing
690630 , labels=[]
@@ -697,7 +637,7 @@ defaultHostConfig = HostConfig {
697637 binds=[]
698638 , containerIDFile=Nothing
699639 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
640+ , networkMode=Bridge
701641 , portBindings=[]
702642 , restartPolicy=RestartOff
703643 , volumeDriver=Nothing
@@ -737,18 +677,14 @@ defaultContainerResources = ContainerResources {
737677 , memory=Nothing
738678 , memoryReservation=Nothing
739679 , memorySwap=Nothing
740− , oomKillDisable=Just False
680+ , oomKillDisable=False
741681 , ulimits=[]
742682 }
743683
744684-- | Default create options when creating a container. You only need to
745685-- specify an image name and the rest is all sensible defaults.
746686defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
687+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752688
753689-- | Override the key sequence for detaching a container.
754690-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +698,16 @@ defaultStartOpts :: StartOpts
762698defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763699
764700-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
701+data DeleteOpts = DeleteOpts {
766702 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767703 , force :: Bool -- ^ If the container is still running force deletion anyway.
768704 } deriving (Eq, Show)
769705
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−
792706-- | Default options for deleting a container. Most of the time we DON'T
793707-- want to delete the container's volumes or force delete it if it's
794708-- 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
709+defaultDeleteOpts :: DeleteOpts
710+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804711
805712-- | Timestamp alias.
806713type Timestamp = Integer
@@ -828,50 +735,18 @@ defaultLogOpts = LogOpts { stdout = True
828735 , tail = All
829736 }
830737
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−
861738-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862739-- | Set permissions on volumes that you mount in the container.
863740data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864741
865742instance ToJSON VolumePermission where
866743 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
744+ toJSON ReadOnly = "ro"
868745
869746instance FromJSON VolumePermission where
870747 parseJSON "rw" = return ReadWrite
871748 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
749+ parseJSON _ = fail "Failed to parse VolumePermission"
875750
876751-- | Used for marking a directory in the container as "exposed" hence
877752-- taking it outside of the COW filesystem and making it mountable
@@ -893,8 +768,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
893768
894769instance {-# OVERLAPPING #-} FromJSON [Volume] where
895770 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"
771+ parseJSON (JSON.Null) = return []
772+ parseJSON _ = fail "Volume is not an object"
898773
899774
900775data Bind = Bind { hostSrc :: Text
@@ -904,10 +779,10 @@ data Bind = Bind { hostSrc :: Text
904779
905780instance FromJSON Bind where
906781 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
782+ [src, dest] -> return $ Bind src dest Nothing
908783 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909784 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
785+ _ -> fail "Could not parse Bind"
911786 parseJSON _ = fail "Bind is not a string"
912787
913788data Device = Device {
@@ -930,15 +805,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930805
931806instance FromJSON VolumeFrom where
932807 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
808+ [vol] -> return $ VolumeFrom vol Nothing
934809 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935810 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
811+ _ -> fail "Could not parse VolumeFrom"
937812 parseJSON _ = fail "VolumeFrom is not a string"
938813
939814instance ToJSON VolumeFrom where
940815 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
816+ Nothing -> toJSON $ n <> ":" <> "rw"
942817 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943818
944819instance ToJSON Bind where
@@ -950,40 +825,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950825
951826instance FromJSON Link where
952827 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
828+ [f] -> return $ Link f Nothing
954829 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
830+ _ -> fail "Could not parse Link"
956831 parseJSON _ = fail "Link is not a string"
957832
958833instance ToJSON Link where
959834 toJSON (Link n1 n2) = toJSON $ case n2 of
960835 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
836+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962837
963838-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964839data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965840
966841instance FromJSON LogDriverType where
967842 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"
843+ parseJSON (JSON.String "syslog") = return Syslog
844+ parseJSON (JSON.String "journald") = return Journald
845+ parseJSON (JSON.String "gelf") = return Gelf
846+ parseJSON (JSON.String "fluentd") = return Fluentd
847+ parseJSON (JSON.String "awslogs") = return AwsLogs
848+ parseJSON (JSON.String "splunk") = return Splunk
849+ parseJSON (JSON.String "etwlogs") = return Etwlogs
850+ parseJSON (JSON.String "none") = return LoggingDisabled
851+ parseJSON _ = fail "Unknown LogDriverType"
977852
978853instance 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"
854+ toJSON JsonFile = JSON.String "json-file"
855+ toJSON Syslog = JSON.String "syslog"
856+ toJSON Journald = JSON.String "journald"
857+ toJSON Gelf = JSON.String "gelf"
858+ toJSON Fluentd = JSON.String "fluentd"
859+ toJSON AwsLogs = JSON.String "awslogs"
860+ toJSON Splunk = JSON.String "splunk"
861+ toJSON Etwlogs = JSON.String "etwlogs"
987862 toJSON LoggingDisabled = JSON.String "none"
988863
989864data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -1017,41 +892,19 @@ instance FromJSON LogDriverConfig where
1017892 parseJSON _ = fail "LogDriverConfig is not an object"
1018893
1019894-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
895+data NetworkMode = Bridge | Host | NetworkDisabled
1021896 deriving (Eq, Show, Ord)
1022897
1023898instance 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"
899+ parseJSON (JSON.String "bridge") = return Bridge
900+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
901+ parseJSON (JSON.String "none") = return NetworkDisabled
902+ parseJSON _ = fail "Unknown NetworkMode"
1029903
1030904instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
905+ toJSON Bridge = JSON.String "bridge"
906+ toJSON Host = JSON.String "host"
1033907 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]
1055908
1056909data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057910
@@ -1067,7 +920,7 @@ instance FromJSON PortType where
1067920 parseJSON val = case val of
1068921 "tcp" -> return TCP
1069922 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
923+ _ -> fail "PortType: Invalid port type."
1071924
1072925-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073926--
@@ -1197,7 +1050,7 @@ instance FromJSON RestartPolicy where
11971050 "on-failure" -> do
11981051 retry <- o .: "MaximumRetryCount"
11991052 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1053+ "off" -> return RestartOff
12011054 _ -> fail "Could not parse RestartPolicy"
12021055 parseJSON _ = fail "RestartPolicy is not an object"
12031056
@@ -1205,7 +1058,7 @@ instance ToJSON RestartPolicy where
12051058 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
12061059 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
12071060 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1061+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
12091062
12101063data Isolation = Default | Process | Hyperv deriving (Eq, Show)
12111064
@@ -1383,7 +1236,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
13831236data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
13841237
13851238instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1239+ toJSON (MemoryConstraint x B) = toJSON x
13871240 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
13881241 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
13891242
@@ -1414,7 +1267,7 @@ data ContainerResources = ContainerResources {
14141267 , memoryReservation :: Maybe MemoryConstraint
14151268 , memorySwap :: Maybe MemoryConstraint
14161269 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1270+ , oomKillDisable :: Bool
14181271 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191272 , ulimits :: [Ulimit]
14201273 -- TODO: Missing from 1.24
@@ -1452,7 +1305,7 @@ instance FromJSON EnvVar where
14521305 parseJSON _ = fail "EnvVar is not a string"
14531306
14541307instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1308+ toJSON (EnvVar n v) = object [n .= v]
14561309
14571310-- | ExposedPort represents a port (and it's type)
14581311-- that a container should expose to other containers or the host system.
@@ -1492,21 +1345,6 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
14921345 where key (ExposedPort p t) = show p <> slash <> show t
14931346 slash = T.unpack "/"
14941347
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−
15101348data ContainerConfig = ContainerConfig {
15111349 hostname :: Maybe Text
15121350 , domainname :: Maybe Text
@@ -1525,7 +1363,7 @@ data ContainerConfig = ContainerConfig {
15251363 , image :: Text
15261364 , volumes :: [Volume]
15271365 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1366+ , entrypoint :: [Text]
15291367 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301368 , macAddress :: Maybe Text
15311369 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1371,6 @@ data ContainerConfig = ContainerConfig {
15331371 , stopSignal :: Signal
15341372 } deriving (Eq, Show, Generic)
15351373
1536−
15371374instance ToJSON ContainerConfig where
15381375 toJSON = genericToJSON defaultOptions {
15391376 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1555,7 +1392,9 @@ instance FromJSON ContainerConfig where
15551392 image <- o .: "Image"
15561393 volumes <- o .: "Volumes"
15571394 workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1395+ entrypoint <- asum [ o .:? "Entrypoint" .!= []
1396+ , (:[]) <$> o .: "Entrypoint"
1397+ ]
15591398 networkDisabled <- o .:? "networkDisabled"
15601399 macAddress <- o .:? "MacAddress"
15611400 labels <- o .:? "Labels" .!= []
@@ -1564,11 +1403,7 @@ instance FromJSON ContainerConfig where
15641403 macAddress labels stopSignal
15651404 parseJSON _ = fail "NetworkSettings is not an object."
15661405
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701406parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721407parseIntegerText t = case readMaybe $ T.unpack t of
15731408 Nothing ->
15741409 fail "Could not parse Integer"