@@ -11,7 +11,11 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14+ , NetworkID
15+ , fromNetworkID
16+ , toNetworkID
1417 , Timeout(..)
18+ , StatusCode(..)
1519 , Signal(..)
1620 , ContainerDetails(..)
1721 , DockerClientOpts(..)
@@ -22,23 +26,30 @@ module Docker.Client.Types (
2226 , ContainerPortInfo(..)
2327 , Container(..)
2428 , ContainerState(..)
25− , Status(..)
29+ , State(..)
2630 , Digest
2731 , Label(..)
2832 , Tag
2933 , Image(..)
34+ , Entrypoint(..)
3035 , dropImagePrefix
3136 , CreateOpts(..)
37+ , BuildOpts(..)
38+ , defaultBuildOpts
3239 , defaultCreateOpts
3340 , DetachKeys(..)
3441 , StartOpts(..)
3542 , defaultStartOpts
36− , DeleteOpts(..)
37− , defaultDeleteOpts
43+ , ContainerDeleteOpts(..)
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
3847 , Timestamp
3948 , TailLogOpt(..)
4049 , LogOpts(..)
4150 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
4253 , VolumePermission(..)
4354 , Bind(..)
4455 , Volume(..)
@@ -64,6 +75,8 @@ module Docker.Client.Types (
6475 , UTSMode(..)
6576 , HostConfig(..)
6677 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
6780 , Ulimit(..)
6881 , ContainerResources(..)
6982 , defaultContainerResources
@@ -99,6 +112,7 @@ import Data.Scientific (floatingOrInteger)
99112import Data.Text (Text)
100113import qualified Data.Text as T
101114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
102116import GHC.Generics (Generic)
103117import Prelude hiding (all, tail)
104118import Text.Read (readMaybe)
@@ -111,14 +125,20 @@ data Endpoint =
111125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
112126 | StartContainerEndpoint StartOpts ContainerID
113127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
114129 | KillContainerEndpoint Signal ContainerID
115130 | RestartContainerEndpoint Timeout ContainerID
116131 | PauseContainerEndpoint ContainerID
117132 | UnpauseContainerEndpoint ContainerID
118133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
119134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
120− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
121136 | 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
122142 deriving (Eq, Show)
123143
124144-- | We should newtype this
@@ -165,6 +185,20 @@ toImageID t =
165185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
166186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
167187
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+
168202-- TODO: Add more Signals or use an existing lib
169203-- | Signal used for sending to the process running in the container.
170204-- The default signal is SIGTERM.
@@ -179,16 +213,16 @@ data Signal = SIGHUP
179213
180214instance FromJSON Signal where
181215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
182− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
183− parseJSON (JSON.String "SIGINT") = return SIGINT
216+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217+ parseJSON (JSON.String "SIGINT") = return SIGINT
184218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
185219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
186220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
187− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
188222
189223instance ToJSON Signal where
190− toJSON SIGHUP = "SIGHUP"
191− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
192226 toJSON SIGQUIT = "SIGQUIT"
193227 toJSON SIGSTOP = "SIGSTOP"
194228 toJSON SIGTERM = "SIGTERM"
@@ -216,7 +250,7 @@ data ContainerDetails = ContainerDetails {
216250 , processLabel :: Text
217251 , resolveConfPath :: FilePath
218252 , restartCount :: Int
219− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
220254 , mounts :: [Mount]
221255 }
222256 deriving (Eq, Show, Generic)
@@ -224,11 +258,11 @@ data ContainerDetails = ContainerDetails {
224258-- | Data type used for parsing the mount information from a container
225259-- list.
226260data Mount = Mount {
227− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
228262 , mountSource :: FilePath
229263 , mountDestination :: FilePath
230− , mountDriver :: Text
231− , mountMode :: Maybe VolumePermission -- apparently this can be null
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
232266 , mountRW :: Bool
233267 , mountPropogation :: Text
234268 }
@@ -236,14 +270,14 @@ data Mount = Mount {
236270
237271instance FromJSON Mount where
238272 parseJSON (JSON.Object o) = do
239− name <- o .: "Name"
273+ name <- o .:? "Name"
240274 src <- o .: "Source"
241275 dest <- o .: "Destination"
242− driver <- o .: "Driver"
243− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
244278 rw <- o .: "RW"
245279 prop <- o .: "Propagation"
246− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
247281 parseJSON _ = fail "Mount is not an object"
248282
249283-- | Data type used for parsing the container state from a list of
@@ -259,7 +293,7 @@ data ContainerState = ContainerState {
259293 , restarting :: Bool
260294 , running :: Bool
261295 , startedAt :: UTCTime
262− , status :: Status
296+ , state :: State
263297 }
264298 deriving (Eq, Show, Generic)
265299
@@ -489,7 +523,8 @@ data Container = Container
489523 , containerImageId :: ImageID
490524 , containerCommand :: Text
491525 , containerCreatedAt :: Int
492− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
493528 , containerPorts :: [ContainerPortInfo]
494529 , containerLabels :: [Label]
495530 , containerNetworks :: [Network]
@@ -497,13 +532,14 @@ data Container = Container
497532 } deriving (Show, Eq)
498533
499534instance FromJSON Container where
500− parseJSON (JSON.Object v) =
501− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
502537 <*> (v .: "Names")
503538 <*> (v .: "Image")
504− <*> (v .: "ImageID")
505− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
506541 <*> (v .: "Created")
542+ <*> (v .: "State")
507543 <*> (v .: "Status")
508544 <*> (v .: "Ports")
509545 <*> (v .: "Labels")
@@ -513,21 +549,20 @@ instance FromJSON Container where
513549 parseNetworks (JSON.Object v) =
514550 (v .: "Networks") >>= parseJSON
515551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
516−
517552 parseJSON _ = fail "Container: Not a JSON object."
518553
519−-- | Represents the status of the container life cycle.
520−data Status = Created | Restarting | Running | Paused | Exited | Dead
554+-- | Represents the state of the container life cycle.
555+data State = Created | Restarting | Running | Paused | Exited | Dead
521556 deriving (Eq, Show, Generic)
522557
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.
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.
526561 parseJSON (JSON.String "restarting") = return Restarting
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"
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
531566
532567-- | Alias for representing a RepoDigest. We could newtype this and add
533568-- some validation.
@@ -588,20 +623,46 @@ instance FromJSON Image where
588623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
589624 parseJSON _ = fail "Failed to parse DockerImage."
590625
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+ ]
591649
592650-- | Options used for creating a Container.
593651data CreateOpts = CreateOpts {
594− containerConfig :: ContainerConfig
595− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
596655 } deriving (Eq, Show)
597656
598657instance ToJSON CreateOpts where
599− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
600659 let ccJSON = toJSON cc
601660 let hcJSON = toJSON hc
602661 case ccJSON of
603662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
604− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665+ JSON.Object o2
605666 _ -> error "ContainerConfig is not an object." -- This should never happen.
606667
607668-- | Container configuration used for creating a container with sensible
@@ -623,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
623684 , cmd=[]
624685 , volumes=[]
625686 , workingDir=Nothing
626− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
627688 , networkDisabled=Nothing
628689 , macAddress=Nothing
629690 , labels=[]
@@ -636,7 +697,7 @@ defaultHostConfig = HostConfig {
636697 binds=[]
637698 , containerIDFile=Nothing
638699 , logConfig=LogDriverConfig JsonFile []
639− , networkMode=Bridge
700+ , networkMode=NetworkBridge
640701 , portBindings=[]
641702 , restartPolicy=RestartOff
642703 , volumeDriver=Nothing
@@ -676,14 +737,18 @@ defaultContainerResources = ContainerResources {
676737 , memory=Nothing
677738 , memoryReservation=Nothing
678739 , memorySwap=Nothing
679− , oomKillDisable=False
740+ , oomKillDisable=Just False
680741 , ulimits=[]
681742 }
682743
683744-- | Default create options when creating a container. You only need to
684745-- specify an image name and the rest is all sensible defaults.
685746defaultCreateOpts :: T.Text -> CreateOpts
686−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
747+defaultCreateOpts imageName = CreateOpts
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
751+ }
687752
688753-- | Override the key sequence for detaching a container.
689754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -697,16 +762,45 @@ defaultStartOpts :: StartOpts
697762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
698763
699764-- | Options for deleting a container.
700−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
701766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
702767 , force :: Bool -- ^ If the container is still running force deletion anyway.
703768 } deriving (Eq, Show)
704769
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+
705792-- | Default options for deleting a container. Most of the time we DON'T
706793-- want to delete the container's volumes or force delete it if it's
707794-- running.
708−defaultDeleteOpts :: DeleteOpts
709−defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
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
710804
711805-- | Timestamp alias.
712806type Timestamp = Integer
@@ -734,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
734828 , tail = All
735829 }
736830
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+
737861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
738862-- | Set permissions on volumes that you mount in the container.
739863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
740864
741865instance ToJSON VolumePermission where
742866 toJSON ReadWrite = "rw"
743− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
744868
745869instance FromJSON VolumePermission where
746870 parseJSON "rw" = return ReadWrite
747871 parseJSON "ro" = return ReadOnly
748− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
749875
750876-- | Used for marking a directory in the container as "exposed" hence
751877-- taking it outside of the COW filesystem and making it mountable
@@ -767,8 +893,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
767893
768894instance {-# OVERLAPPING #-} FromJSON [Volume] where
769895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
770− parseJSON (JSON.Null) = return []
771− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
772898
773899
774900data Bind = Bind { hostSrc :: Text
@@ -778,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
778904
779905instance FromJSON Bind where
780906 parseJSON (JSON.String t) = case T.split (== ':') t of
781− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
782908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
783909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
784− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
785911 parseJSON _ = fail "Bind is not a string"
786912
787913data Device = Device {
@@ -804,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
804930
805931instance FromJSON VolumeFrom where
806932 parseJSON (JSON.String t) = case T.split (== ':') t of
807− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
808934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
809935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
810− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
811937 parseJSON _ = fail "VolumeFrom is not a string"
812938
813939instance ToJSON VolumeFrom where
814940 toJSON (VolumeFrom n p) = case p of
815− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
816942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
817943
818944instance ToJSON Bind where
@@ -824,40 +950,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
824950
825951instance FromJSON Link where
826952 parseJSON (JSON.String t) = case T.split (== ':') t of
827− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
828954 [f,s] -> return $ Link f $ Just s
829− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
830956 parseJSON _ = fail "Link is not a string"
831957
832958instance ToJSON Link where
833959 toJSON (Link n1 n2) = toJSON $ case n2 of
834960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
835− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
836962
837963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
838964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
839965
840966instance FromJSON LogDriverType where
841967 parseJSON (JSON.String "json-file") = return JsonFile
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"
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"
851977
852978instance ToJSON LogDriverType where
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"
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"
861987 toJSON LoggingDisabled = JSON.String "none"
862988
863989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -891,19 +1017,41 @@ instance FromJSON LogDriverConfig where
8911017 parseJSON _ = fail "LogDriverConfig is not an object"
8921018
8931019-- TODO: Add container:<name|id> mode
894−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
8951021 deriving (Eq, Show, Ord)
8961022
8971023instance FromJSON NetworkMode where
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"
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"
9021029
9031030instance ToJSON NetworkMode where
904− toJSON Bridge = JSON.String "bridge"
905− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
9061033 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]
9071055
9081056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9091057
@@ -919,7 +1067,7 @@ instance FromJSON PortType where
9191067 parseJSON val = case val of
9201068 "tcp" -> return TCP
9211069 "udp" -> return UDP
922− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9231071
9241072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9251073--
@@ -1049,7 +1197,7 @@ instance FromJSON RestartPolicy where
10491197 "on-failure" -> do
10501198 retry <- o .: "MaximumRetryCount"
10511199 return $ RestartOnFailure retry
1052− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10531201 _ -> fail "Could not parse RestartPolicy"
10541202 parseJSON _ = fail "RestartPolicy is not an object"
10551203
@@ -1057,7 +1205,7 @@ instance ToJSON RestartPolicy where
10571205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10581206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
10591207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1060− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
10611209
10621210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
10631211
@@ -1235,7 +1383,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
12351383data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
12361384
12371385instance ToJSON MemoryConstraint where
1238− toJSON (MemoryConstraint x B) = toJSON x
1386+ toJSON (MemoryConstraint x B) = toJSON x
12391387 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
12401388 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
12411389
@@ -1266,7 +1414,7 @@ data ContainerResources = ContainerResources {
12661414 , memoryReservation :: Maybe MemoryConstraint
12671415 , memorySwap :: Maybe MemoryConstraint
12681416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1269− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
12701418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
12711419 , ulimits :: [Ulimit]
12721420 -- TODO: Missing from 1.24
@@ -1304,7 +1452,7 @@ instance FromJSON EnvVar where
13041452 parseJSON _ = fail "EnvVar is not a string"
13051453
13061454instance ToJSON EnvVar where
1307− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
13081456
13091457-- | ExposedPort represents a port (and it's type)
13101458-- that a container should expose to other containers or the host system.
@@ -1344,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
13441492 where key (ExposedPort p t) = show p <> slash <> show t
13451493 slash = T.unpack "/"
13461494
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+
13471510data ContainerConfig = ContainerConfig {
13481511 hostname :: Maybe Text
13491512 , domainname :: Maybe Text
@@ -1362,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
13621525 , image :: Text
13631526 , volumes :: [Volume]
13641527 , workingDir :: Maybe FilePath
1365− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
13661529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
13671530 , macAddress :: Maybe Text
13681531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1370,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
13701533 , stopSignal :: Signal
13711534 } deriving (Eq, Show, Generic)
13721535
1536+
13731537instance ToJSON ContainerConfig where
13741538 toJSON = genericToJSON defaultOptions {
13751539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1391,7 +1555,7 @@ instance FromJSON ContainerConfig where
13911555 image <- o .: "Image"
13921556 volumes <- o .: "Volumes"
13931557 workingDir <- o .:? "WorkingDir"
1394− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
13951559 networkDisabled <- o .:? "networkDisabled"
13961560 macAddress <- o .:? "MacAddress"
13971561 labels <- o .:? "Labels" .!= []
@@ -1400,7 +1564,11 @@ instance FromJSON ContainerConfig where
14001564 macAddress labels stopSignal
14011565 parseJSON _ = fail "NetworkSettings is not an object."
14021566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
14031570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
14041572parseIntegerText t = case readMaybe $ T.unpack t of
14051573 Nothing ->
14061574 fail "Could not parse Integer"
@@ -1422,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
14221590-- | Helper function that return an empty dictionary "{}"
14231591emptyJsonObject :: JSON.Value
14241592emptyJsonObject = JSON.Object HM.empty
1425−