@@ -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
@@ -83,6 +96,8 @@ module Docker.Client.Types (
8396 , addLink
8497 , addVolume
8598 , addVolumeFrom
99+ , MemoryConstraint(..)
100+ , MemoryConstraintSize(..)
86101 ) where
87102
88103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -97,6 +112,7 @@ import Data.Scientific (floatingOrInteger)
97112import Data.Text (Text)
98113import qualified Data.Text as T
99114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
100116import GHC.Generics (Generic)
101117import Prelude hiding (all, tail)
102118import Text.Read (readMaybe)
@@ -109,14 +125,20 @@ data Endpoint =
109125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
110126 | StartContainerEndpoint StartOpts ContainerID
111127 | StopContainerEndpoint Timeout ContainerID
128+ | WaitContainerEndpoint ContainerID
112129 | KillContainerEndpoint Signal ContainerID
113130 | RestartContainerEndpoint Timeout ContainerID
114131 | PauseContainerEndpoint ContainerID
115132 | UnpauseContainerEndpoint ContainerID
116133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
117134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
118− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
119136 | 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
120142 deriving (Eq, Show)
121143
122144-- | We should newtype this
@@ -163,6 +185,20 @@ toImageID t =
163185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
164186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
165187
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+
166202-- TODO: Add more Signals or use an existing lib
167203-- | Signal used for sending to the process running in the container.
168204-- The default signal is SIGTERM.
@@ -177,16 +213,16 @@ data Signal = SIGHUP
177213
178214instance FromJSON Signal where
179215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
180− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
181− 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
182218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
183219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
184220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
185− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
186222
187223instance ToJSON Signal where
188− toJSON SIGHUP = "SIGHUP"
189− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
190226 toJSON SIGQUIT = "SIGQUIT"
191227 toJSON SIGSTOP = "SIGSTOP"
192228 toJSON SIGTERM = "SIGTERM"
@@ -214,7 +250,7 @@ data ContainerDetails = ContainerDetails {
214250 , processLabel :: Text
215251 , resolveConfPath :: FilePath
216252 , restartCount :: Int
217− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
218254 , mounts :: [Mount]
219255 }
220256 deriving (Eq, Show, Generic)
@@ -222,11 +258,11 @@ data ContainerDetails = ContainerDetails {
222258-- | Data type used for parsing the mount information from a container
223259-- list.
224260data Mount = Mount {
225− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
226262 , mountSource :: FilePath
227263 , mountDestination :: FilePath
228− , mountDriver :: Text
229− , mountMode :: Maybe VolumePermission -- apparently this can be null
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
230266 , mountRW :: Bool
231267 , mountPropogation :: Text
232268 }
@@ -234,14 +270,14 @@ data Mount = Mount {
234270
235271instance FromJSON Mount where
236272 parseJSON (JSON.Object o) = do
237− name <- o .: "Name"
273+ name <- o .:? "Name"
238274 src <- o .: "Source"
239275 dest <- o .: "Destination"
240− driver <- o .: "Driver"
241− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
242278 rw <- o .: "RW"
243279 prop <- o .: "Propagation"
244− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
245281 parseJSON _ = fail "Mount is not an object"
246282
247283-- | Data type used for parsing the container state from a list of
@@ -257,7 +293,7 @@ data ContainerState = ContainerState {
257293 , restarting :: Bool
258294 , running :: Bool
259295 , startedAt :: UTCTime
260− , status :: Status
296+ , state :: State
261297 }
262298 deriving (Eq, Show, Generic)
263299
@@ -487,7 +523,8 @@ data Container = Container
487523 , containerImageId :: ImageID
488524 , containerCommand :: Text
489525 , containerCreatedAt :: Int
490− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
491528 , containerPorts :: [ContainerPortInfo]
492529 , containerLabels :: [Label]
493530 , containerNetworks :: [Network]
@@ -495,13 +532,14 @@ data Container = Container
495532 } deriving (Show, Eq)
496533
497534instance FromJSON Container where
498− parseJSON (JSON.Object v) =
499− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
500537 <*> (v .: "Names")
501538 <*> (v .: "Image")
502− <*> (v .: "ImageID")
503− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
504541 <*> (v .: "Created")
542+ <*> (v .: "State")
505543 <*> (v .: "Status")
506544 <*> (v .: "Ports")
507545 <*> (v .: "Labels")
@@ -511,21 +549,20 @@ instance FromJSON Container where
511549 parseNetworks (JSON.Object v) =
512550 (v .: "Networks") >>= parseJSON
513551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
514−
515552 parseJSON _ = fail "Container: Not a JSON object."
516553
517−-- | Represents the status of the container life cycle.
518−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
519556 deriving (Eq, Show, Generic)
520557
521−instance FromJSON Status where
522− parseJSON (JSON.String "running") = return Running
523− 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.
524561 parseJSON (JSON.String "restarting") = return Restarting
525− parseJSON (JSON.String "paused") = return Paused
526− parseJSON (JSON.String "exited") = return Exited
527− parseJSON (JSON.String "dead") = return Dead
528− 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
529566
530567-- | Alias for representing a RepoDigest. We could newtype this and add
531568-- some validation.
@@ -586,20 +623,46 @@ instance FromJSON Image where
586623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
587624 parseJSON _ = fail "Failed to parse DockerImage."
588625
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+ ]
589649
590650-- | Options used for creating a Container.
591651data CreateOpts = CreateOpts {
592− containerConfig :: ContainerConfig
593− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
594655 } deriving (Eq, Show)
595656
596657instance ToJSON CreateOpts where
597− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
598659 let ccJSON = toJSON cc
599660 let hcJSON = toJSON hc
600661 case ccJSON of
601662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
602− 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
603666 _ -> error "ContainerConfig is not an object." -- This should never happen.
604667
605668-- | Container configuration used for creating a container with sensible
@@ -621,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
621684 , cmd=[]
622685 , volumes=[]
623686 , workingDir=Nothing
624− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
625688 , networkDisabled=Nothing
626689 , macAddress=Nothing
627690 , labels=[]
@@ -634,7 +697,7 @@ defaultHostConfig = HostConfig {
634697 binds=[]
635698 , containerIDFile=Nothing
636699 , logConfig=LogDriverConfig JsonFile []
637− , networkMode=Bridge
700+ , networkMode=NetworkBridge
638701 , portBindings=[]
639702 , restartPolicy=RestartOff
640703 , volumeDriver=Nothing
@@ -674,14 +737,18 @@ defaultContainerResources = ContainerResources {
674737 , memory=Nothing
675738 , memoryReservation=Nothing
676739 , memorySwap=Nothing
677− , oomKillDisable=False
740+ , oomKillDisable=Just False
678741 , ulimits=[]
679742 }
680743
681744-- | Default create options when creating a container. You only need to
682745-- specify an image name and the rest is all sensible defaults.
683746defaultCreateOpts :: T.Text -> CreateOpts
684−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+ }
685752
686753-- | Override the key sequence for detaching a container.
687754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -695,16 +762,45 @@ defaultStartOpts :: StartOpts
695762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
696763
697764-- | Options for deleting a container.
698−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
699766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
700767 , force :: Bool -- ^ If the container is still running force deletion anyway.
701768 } deriving (Eq, Show)
702769
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+
703792-- | Default options for deleting a container. Most of the time we DON'T
704793-- want to delete the container's volumes or force delete it if it's
705794-- running.
706−defaultDeleteOpts :: DeleteOpts
707−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
708804
709805-- | Timestamp alias.
710806type Timestamp = Integer
@@ -732,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
732828 , tail = All
733829 }
734830
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+
735861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
736862-- | Set permissions on volumes that you mount in the container.
737863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
738864
739865instance ToJSON VolumePermission where
740866 toJSON ReadWrite = "rw"
741− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
742868
743869instance FromJSON VolumePermission where
744870 parseJSON "rw" = return ReadWrite
745871 parseJSON "ro" = return ReadOnly
746− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
747875
748876-- | Used for marking a directory in the container as "exposed" hence
749877-- taking it outside of the COW filesystem and making it mountable
@@ -765,8 +893,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
765893
766894instance {-# OVERLAPPING #-} FromJSON [Volume] where
767895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
768− parseJSON (JSON.Null) = return []
769− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
770898
771899
772900data Bind = Bind { hostSrc :: Text
@@ -776,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
776904
777905instance FromJSON Bind where
778906 parseJSON (JSON.String t) = case T.split (== ':') t of
779− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
780908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
781909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
782− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
783911 parseJSON _ = fail "Bind is not a string"
784912
785913data Device = Device {
@@ -802,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
802930
803931instance FromJSON VolumeFrom where
804932 parseJSON (JSON.String t) = case T.split (== ':') t of
805− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
806934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
807935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
808− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
809937 parseJSON _ = fail "VolumeFrom is not a string"
810938
811939instance ToJSON VolumeFrom where
812940 toJSON (VolumeFrom n p) = case p of
813− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
814942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
815943
816944instance ToJSON Bind where
@@ -822,40 +950,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
822950
823951instance FromJSON Link where
824952 parseJSON (JSON.String t) = case T.split (== ':') t of
825− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
826954 [f,s] -> return $ Link f $ Just s
827− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
828956 parseJSON _ = fail "Link is not a string"
829957
830958instance ToJSON Link where
831959 toJSON (Link n1 n2) = toJSON $ case n2 of
832960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
833− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
834962
835963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
836964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
837965
838966instance FromJSON LogDriverType where
839967 parseJSON (JSON.String "json-file") = return JsonFile
840− parseJSON (JSON.String "syslog") = return Syslog
841− parseJSON (JSON.String "journald") = return Journald
842− parseJSON (JSON.String "gelf") = return Gelf
843− parseJSON (JSON.String "fluentd") = return Fluentd
844− parseJSON (JSON.String "awslogs") = return AwsLogs
845− parseJSON (JSON.String "splunk") = return Splunk
846− parseJSON (JSON.String "etwlogs") = return Etwlogs
847− parseJSON (JSON.String "none") = return LoggingDisabled
848− 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"
849977
850978instance ToJSON LogDriverType where
851− toJSON JsonFile = JSON.String "json-file"
852− toJSON Syslog = JSON.String "syslog"
853− toJSON Journald = JSON.String "journald"
854− toJSON Gelf = JSON.String "gelf"
855− toJSON Fluentd = JSON.String "fluentd"
856− toJSON AwsLogs = JSON.String "awslogs"
857− toJSON Splunk = JSON.String "splunk"
858− 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"
859987 toJSON LoggingDisabled = JSON.String "none"
860988
861989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -889,19 +1017,41 @@ instance FromJSON LogDriverConfig where
8891017 parseJSON _ = fail "LogDriverConfig is not an object"
8901018
8911019-- TODO: Add container:<name|id> mode
892−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
8931021 deriving (Eq, Show, Ord)
8941022
8951023instance FromJSON NetworkMode where
896− parseJSON (JSON.String "bridge") = return Bridge
897− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
898− parseJSON (JSON.String "none") = return NetworkDisabled
899− 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"
9001029
9011030instance ToJSON NetworkMode where
902− toJSON Bridge = JSON.String "bridge"
903− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
9041033 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]
9051055
9061056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9071057
@@ -917,7 +1067,7 @@ instance FromJSON PortType where
9171067 parseJSON val = case val of
9181068 "tcp" -> return TCP
9191069 "udp" -> return UDP
920− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9211071
9221072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9231073--
@@ -1047,7 +1197,7 @@ instance FromJSON RestartPolicy where
10471197 "on-failure" -> do
10481198 retry <- o .: "MaximumRetryCount"
10491199 return $ RestartOnFailure retry
1050− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10511201 _ -> fail "Could not parse RestartPolicy"
10521202 parseJSON _ = fail "RestartPolicy is not an object"
10531203
@@ -1055,7 +1205,7 @@ instance ToJSON RestartPolicy where
10551205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10561206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
10571207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1058− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
10591209
10601210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
10611211
@@ -1233,7 +1383,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
12331383data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
12341384
12351385instance ToJSON MemoryConstraint where
1236− toJSON (MemoryConstraint x B) = toJSON x
1386+ toJSON (MemoryConstraint x B) = toJSON x
12371387 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
12381388 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
12391389
@@ -1264,7 +1414,7 @@ data ContainerResources = ContainerResources {
12641414 , memoryReservation :: Maybe MemoryConstraint
12651415 , memorySwap :: Maybe MemoryConstraint
12661416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1267− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
12681418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
12691419 , ulimits :: [Ulimit]
12701420 -- TODO: Missing from 1.24
@@ -1302,7 +1452,7 @@ instance FromJSON EnvVar where
13021452 parseJSON _ = fail "EnvVar is not a string"
13031453
13041454instance ToJSON EnvVar where
1305− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
13061456
13071457-- | ExposedPort represents a port (and it's type)
13081458-- that a container should expose to other containers or the host system.
@@ -1342,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
13421492 where key (ExposedPort p t) = show p <> slash <> show t
13431493 slash = T.unpack "/"
13441494
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+
13451510data ContainerConfig = ContainerConfig {
13461511 hostname :: Maybe Text
13471512 , domainname :: Maybe Text
@@ -1360,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
13601525 , image :: Text
13611526 , volumes :: [Volume]
13621527 , workingDir :: Maybe FilePath
1363− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
13641529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
13651530 , macAddress :: Maybe Text
13661531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1368,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
13681533 , stopSignal :: Signal
13691534 } deriving (Eq, Show, Generic)
13701535
1536+
13711537instance ToJSON ContainerConfig where
13721538 toJSON = genericToJSON defaultOptions {
13731539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1389,7 +1555,7 @@ instance FromJSON ContainerConfig where
13891555 image <- o .: "Image"
13901556 volumes <- o .: "Volumes"
13911557 workingDir <- o .:? "WorkingDir"
1392− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
13931559 networkDisabled <- o .:? "networkDisabled"
13941560 macAddress <- o .:? "MacAddress"
13951561 labels <- o .:? "Labels" .!= []
@@ -1398,7 +1564,11 @@ instance FromJSON ContainerConfig where
13981564 macAddress labels stopSignal
13991565 parseJSON _ = fail "NetworkSettings is not an object."
14001566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
14011570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
14021572parseIntegerText t = case readMaybe $ T.unpack t of
14031573 Nothing ->
14041574 fail "Could not parse Integer"
@@ -1420,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
14201590-- | Helper function that return an empty dictionary "{}"
14211591emptyJsonObject :: JSON.Value
14221592emptyJsonObject = JSON.Object HM.empty
1423−