@@ -11,6 +11,9 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14+ , NetworkID
15+ , fromNetworkID
16+ , toNetworkID
1417 , Timeout(..)
1518 , StatusCode(..)
1619 , Signal(..)
@@ -23,23 +26,30 @@ module Docker.Client.Types (
2326 , ContainerPortInfo(..)
2427 , Container(..)
2528 , ContainerState(..)
26− , Status(..)
29+ , State(..)
2730 , Digest
2831 , Label(..)
2932 , Tag
3033 , Image(..)
34+ , Entrypoint(..)
3135 , dropImagePrefix
3236 , CreateOpts(..)
37+ , BuildOpts(..)
38+ , defaultBuildOpts
3339 , defaultCreateOpts
3440 , DetachKeys(..)
3541 , StartOpts(..)
3642 , defaultStartOpts
37− , DeleteOpts(..)
38− , defaultDeleteOpts
43+ , ContainerDeleteOpts(..)
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
3947 , Timestamp
4048 , TailLogOpt(..)
4149 , LogOpts(..)
4250 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
4353 , VolumePermission(..)
4454 , Bind(..)
4555 , Volume(..)
@@ -65,6 +75,8 @@ module Docker.Client.Types (
6575 , UTSMode(..)
6676 , HostConfig(..)
6777 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
6880 , Ulimit(..)
6981 , ContainerResources(..)
7082 , defaultContainerResources
@@ -100,6 +112,7 @@ import Data.Scientific (floatingOrInteger)
100112import Data.Text (Text)
101113import qualified Data.Text as T
102114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
103116import GHC.Generics (Generic)
104117import Prelude hiding (all, tail)
105118import Text.Read (readMaybe)
@@ -119,8 +132,13 @@ data Endpoint =
119132 | UnpauseContainerEndpoint ContainerID
120133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
121134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
122− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
123136 | 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
124142 deriving (Eq, Show)
125143
126144-- | We should newtype this
@@ -195,16 +213,16 @@ data Signal = SIGHUP
195213
196214instance FromJSON Signal where
197215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
198− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
199− 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
200218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
201219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
202220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
203− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
204222
205223instance ToJSON Signal where
206− toJSON SIGHUP = "SIGHUP"
207− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
208226 toJSON SIGQUIT = "SIGQUIT"
209227 toJSON SIGSTOP = "SIGSTOP"
210228 toJSON SIGTERM = "SIGTERM"
@@ -232,7 +250,7 @@ data ContainerDetails = ContainerDetails {
232250 , processLabel :: Text
233251 , resolveConfPath :: FilePath
234252 , restartCount :: Int
235− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
236254 , mounts :: [Mount]
237255 }
238256 deriving (Eq, Show, Generic)
@@ -240,11 +258,11 @@ data ContainerDetails = ContainerDetails {
240258-- | Data type used for parsing the mount information from a container
241259-- list.
242260data Mount = Mount {
243− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
244262 , mountSource :: FilePath
245263 , mountDestination :: FilePath
246− , mountDriver :: Text
247− , mountMode :: Maybe VolumePermission -- apparently this can be null
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
248266 , mountRW :: Bool
249267 , mountPropogation :: Text
250268 }
@@ -252,14 +270,14 @@ data Mount = Mount {
252270
253271instance FromJSON Mount where
254272 parseJSON (JSON.Object o) = do
255− name <- o .: "Name"
273+ name <- o .:? "Name"
256274 src <- o .: "Source"
257275 dest <- o .: "Destination"
258− driver <- o .: "Driver"
259− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
260278 rw <- o .: "RW"
261279 prop <- o .: "Propagation"
262− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
263281 parseJSON _ = fail "Mount is not an object"
264282
265283-- | Data type used for parsing the container state from a list of
@@ -275,7 +293,7 @@ data ContainerState = ContainerState {
275293 , restarting :: Bool
276294 , running :: Bool
277295 , startedAt :: UTCTime
278− , status :: Status
296+ , state :: State
279297 }
280298 deriving (Eq, Show, Generic)
281299
@@ -505,7 +523,8 @@ data Container = Container
505523 , containerImageId :: ImageID
506524 , containerCommand :: Text
507525 , containerCreatedAt :: Int
508− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
509528 , containerPorts :: [ContainerPortInfo]
510529 , containerLabels :: [Label]
511530 , containerNetworks :: [Network]
@@ -513,13 +532,14 @@ data Container = Container
513532 } deriving (Show, Eq)
514533
515534instance FromJSON Container where
516− parseJSON (JSON.Object v) =
517− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
518537 <*> (v .: "Names")
519538 <*> (v .: "Image")
520− <*> (v .: "ImageID")
521− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
522541 <*> (v .: "Created")
542+ <*> (v .: "State")
523543 <*> (v .: "Status")
524544 <*> (v .: "Ports")
525545 <*> (v .: "Labels")
@@ -529,21 +549,20 @@ instance FromJSON Container where
529549 parseNetworks (JSON.Object v) =
530550 (v .: "Networks") >>= parseJSON
531551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
532−
533552 parseJSON _ = fail "Container: Not a JSON object."
534553
535−-- | Represents the status of the container life cycle.
536−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
537556 deriving (Eq, Show, Generic)
538557
539−instance FromJSON Status where
540− parseJSON (JSON.String "running") = return Running
541− 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.
542561 parseJSON (JSON.String "restarting") = return Restarting
543− parseJSON (JSON.String "paused") = return Paused
544− parseJSON (JSON.String "exited") = return Exited
545− parseJSON (JSON.String "dead") = return Dead
546− 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
547566
548567-- | Alias for representing a RepoDigest. We could newtype this and add
549568-- some validation.
@@ -604,20 +623,46 @@ instance FromJSON Image where
604623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
605624 parseJSON _ = fail "Failed to parse DockerImage."
606625
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+ ]
607649
608650-- | Options used for creating a Container.
609651data CreateOpts = CreateOpts {
610− containerConfig :: ContainerConfig
611− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
612655 } deriving (Eq, Show)
613656
614657instance ToJSON CreateOpts where
615− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
616659 let ccJSON = toJSON cc
617660 let hcJSON = toJSON hc
618661 case ccJSON of
619662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
620− 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
621666 _ -> error "ContainerConfig is not an object." -- This should never happen.
622667
623668-- | Container configuration used for creating a container with sensible
@@ -639,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
639684 , cmd=[]
640685 , volumes=[]
641686 , workingDir=Nothing
642− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
643688 , networkDisabled=Nothing
644689 , macAddress=Nothing
645690 , labels=[]
@@ -652,7 +697,7 @@ defaultHostConfig = HostConfig {
652697 binds=[]
653698 , containerIDFile=Nothing
654699 , logConfig=LogDriverConfig JsonFile []
655− , networkMode=Bridge
700+ , networkMode=NetworkBridge
656701 , portBindings=[]
657702 , restartPolicy=RestartOff
658703 , volumeDriver=Nothing
@@ -692,14 +737,18 @@ defaultContainerResources = ContainerResources {
692737 , memory=Nothing
693738 , memoryReservation=Nothing
694739 , memorySwap=Nothing
695− , oomKillDisable=False
740+ , oomKillDisable=Just False
696741 , ulimits=[]
697742 }
698743
699744-- | Default create options when creating a container. You only need to
700745-- specify an image name and the rest is all sensible defaults.
701746defaultCreateOpts :: T.Text -> CreateOpts
702−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+ }
703752
704753-- | Override the key sequence for detaching a container.
705754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -713,16 +762,45 @@ defaultStartOpts :: StartOpts
713762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
714763
715764-- | Options for deleting a container.
716−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
717766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
718767 , force :: Bool -- ^ If the container is still running force deletion anyway.
719768 } deriving (Eq, Show)
720769
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+
721792-- | Default options for deleting a container. Most of the time we DON'T
722793-- want to delete the container's volumes or force delete it if it's
723794-- running.
724−defaultDeleteOpts :: DeleteOpts
725−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
726804
727805-- | Timestamp alias.
728806type Timestamp = Integer
@@ -750,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
750828 , tail = All
751829 }
752830
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+
753861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
754862-- | Set permissions on volumes that you mount in the container.
755863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
756864
757865instance ToJSON VolumePermission where
758866 toJSON ReadWrite = "rw"
759− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
760868
761869instance FromJSON VolumePermission where
762870 parseJSON "rw" = return ReadWrite
763871 parseJSON "ro" = return ReadOnly
764− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
765875
766876-- | Used for marking a directory in the container as "exposed" hence
767877-- taking it outside of the COW filesystem and making it mountable
@@ -783,8 +893,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
783893
784894instance {-# OVERLAPPING #-} FromJSON [Volume] where
785895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
786− parseJSON (JSON.Null) = return []
787− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
788898
789899
790900data Bind = Bind { hostSrc :: Text
@@ -794,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
794904
795905instance FromJSON Bind where
796906 parseJSON (JSON.String t) = case T.split (== ':') t of
797− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
798908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
799909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
800− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
801911 parseJSON _ = fail "Bind is not a string"
802912
803913data Device = Device {
@@ -820,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
820930
821931instance FromJSON VolumeFrom where
822932 parseJSON (JSON.String t) = case T.split (== ':') t of
823− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
824934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
825935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
826− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
827937 parseJSON _ = fail "VolumeFrom is not a string"
828938
829939instance ToJSON VolumeFrom where
830940 toJSON (VolumeFrom n p) = case p of
831− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
832942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
833943
834944instance ToJSON Bind where
@@ -840,40 +950,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
840950
841951instance FromJSON Link where
842952 parseJSON (JSON.String t) = case T.split (== ':') t of
843− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
844954 [f,s] -> return $ Link f $ Just s
845− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
846956 parseJSON _ = fail "Link is not a string"
847957
848958instance ToJSON Link where
849959 toJSON (Link n1 n2) = toJSON $ case n2 of
850960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
851− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
852962
853963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
854964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
855965
856966instance FromJSON LogDriverType where
857967 parseJSON (JSON.String "json-file") = return JsonFile
858− parseJSON (JSON.String "syslog") = return Syslog
859− parseJSON (JSON.String "journald") = return Journald
860− parseJSON (JSON.String "gelf") = return Gelf
861− parseJSON (JSON.String "fluentd") = return Fluentd
862− parseJSON (JSON.String "awslogs") = return AwsLogs
863− parseJSON (JSON.String "splunk") = return Splunk
864− parseJSON (JSON.String "etwlogs") = return Etwlogs
865− parseJSON (JSON.String "none") = return LoggingDisabled
866− 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"
867977
868978instance ToJSON LogDriverType where
869− toJSON JsonFile = JSON.String "json-file"
870− toJSON Syslog = JSON.String "syslog"
871− toJSON Journald = JSON.String "journald"
872− toJSON Gelf = JSON.String "gelf"
873− toJSON Fluentd = JSON.String "fluentd"
874− toJSON AwsLogs = JSON.String "awslogs"
875− toJSON Splunk = JSON.String "splunk"
876− 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"
877987 toJSON LoggingDisabled = JSON.String "none"
878988
879989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -907,19 +1017,41 @@ instance FromJSON LogDriverConfig where
9071017 parseJSON _ = fail "LogDriverConfig is not an object"
9081018
9091019-- TODO: Add container:<name|id> mode
910−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
9111021 deriving (Eq, Show, Ord)
9121022
9131023instance FromJSON NetworkMode where
914− parseJSON (JSON.String "bridge") = return Bridge
915− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
916− parseJSON (JSON.String "none") = return NetworkDisabled
917− 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"
9181029
9191030instance ToJSON NetworkMode where
920− toJSON Bridge = JSON.String "bridge"
921− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
9221033 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]
9231055
9241056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9251057
@@ -935,7 +1067,7 @@ instance FromJSON PortType where
9351067 parseJSON val = case val of
9361068 "tcp" -> return TCP
9371069 "udp" -> return UDP
938− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9391071
9401072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9411073--
@@ -1065,7 +1197,7 @@ instance FromJSON RestartPolicy where
10651197 "on-failure" -> do
10661198 retry <- o .: "MaximumRetryCount"
10671199 return $ RestartOnFailure retry
1068− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10691201 _ -> fail "Could not parse RestartPolicy"
10701202 parseJSON _ = fail "RestartPolicy is not an object"
10711203
@@ -1073,7 +1205,7 @@ instance ToJSON RestartPolicy where
10731205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10741206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
10751207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1076− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
10771209
10781210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
10791211
@@ -1251,7 +1383,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
12511383data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
12521384
12531385instance ToJSON MemoryConstraint where
1254− toJSON (MemoryConstraint x B) = toJSON x
1386+ toJSON (MemoryConstraint x B) = toJSON x
12551387 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
12561388 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
12571389
@@ -1282,7 +1414,7 @@ data ContainerResources = ContainerResources {
12821414 , memoryReservation :: Maybe MemoryConstraint
12831415 , memorySwap :: Maybe MemoryConstraint
12841416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1285− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
12861418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
12871419 , ulimits :: [Ulimit]
12881420 -- TODO: Missing from 1.24
@@ -1320,7 +1452,7 @@ instance FromJSON EnvVar where
13201452 parseJSON _ = fail "EnvVar is not a string"
13211453
13221454instance ToJSON EnvVar where
1323− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
13241456
13251457-- | ExposedPort represents a port (and it's type)
13261458-- that a container should expose to other containers or the host system.
@@ -1360,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
13601492 where key (ExposedPort p t) = show p <> slash <> show t
13611493 slash = T.unpack "/"
13621494
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+
13631510data ContainerConfig = ContainerConfig {
13641511 hostname :: Maybe Text
13651512 , domainname :: Maybe Text
@@ -1378,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
13781525 , image :: Text
13791526 , volumes :: [Volume]
13801527 , workingDir :: Maybe FilePath
1381− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
13821529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
13831530 , macAddress :: Maybe Text
13841531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1386,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
13861533 , stopSignal :: Signal
13871534 } deriving (Eq, Show, Generic)
13881535
1536+
13891537instance ToJSON ContainerConfig where
13901538 toJSON = genericToJSON defaultOptions {
13911539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1407,7 +1555,7 @@ instance FromJSON ContainerConfig where
14071555 image <- o .: "Image"
14081556 volumes <- o .: "Volumes"
14091557 workingDir <- o .:? "WorkingDir"
1410− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
14111559 networkDisabled <- o .:? "networkDisabled"
14121560 macAddress <- o .:? "MacAddress"
14131561 labels <- o .:? "Labels" .!= []
@@ -1416,7 +1564,11 @@ instance FromJSON ContainerConfig where
14161564 macAddress labels stopSignal
14171565 parseJSON _ = fail "NetworkSettings is not an object."
14181566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
14191570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
14201572parseIntegerText t = case readMaybe $ T.unpack t of
14211573 Nothing ->
14221574 fail "Could not parse Integer"
@@ -1438,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
14381590-- | Helper function that return an empty dictionary "{}"
14391591emptyJsonObject :: JSON.Value
14401592emptyJsonObject = JSON.Object HM.empty
1441−