@@ -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,11 +26,12 @@ 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(..)
3337 , BuildOpts(..)
@@ -36,12 +40,16 @@ module Docker.Client.Types (
3640 , DetachKeys(..)
3741 , StartOpts(..)
3842 , defaultStartOpts
39− , DeleteOpts(..)
40− , defaultDeleteOpts
43+ , ContainerDeleteOpts(..)
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
4147 , Timestamp
4248 , TailLogOpt(..)
4349 , LogOpts(..)
4450 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
4553 , VolumePermission(..)
4654 , Bind(..)
4755 , Volume(..)
@@ -67,6 +75,8 @@ module Docker.Client.Types (
6775 , UTSMode(..)
6876 , HostConfig(..)
6977 , defaultHostConfig
78+ , NetworkingConfig(..)
79+ , EndpointConfig(..)
7080 , Ulimit(..)
7181 , ContainerResources(..)
7282 , defaultContainerResources
@@ -102,6 +112,7 @@ import Data.Scientific (floatingOrInteger)
102112import Data.Text (Text)
103113import qualified Data.Text as T
104114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
105116import GHC.Generics (Generic)
106117import Prelude hiding (all, tail)
107118import Text.Read (readMaybe)
@@ -121,9 +132,13 @@ data Endpoint =
121132 | UnpauseContainerEndpoint ContainerID
122133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
123134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
124− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
125136 | InspectContainerEndpoint ContainerID
126137 | 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
127142 deriving (Eq, Show)
128143
129144-- | We should newtype this
@@ -198,16 +213,16 @@ data Signal = SIGHUP
198213
199214instance FromJSON Signal where
200215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
201− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
202− 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
203218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
204219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
205220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
206− parseJSON _ = fail "Unknown Signal"
221+ parseJSON _ = fail "Unknown Signal"
207222
208223instance ToJSON Signal where
209− toJSON SIGHUP = "SIGHUP"
210− toJSON SIGINT = "SIGINT"
224+ toJSON SIGHUP = "SIGHUP"
225+ toJSON SIGINT = "SIGINT"
211226 toJSON SIGQUIT = "SIGQUIT"
212227 toJSON SIGSTOP = "SIGSTOP"
213228 toJSON SIGTERM = "SIGTERM"
@@ -235,7 +250,7 @@ data ContainerDetails = ContainerDetails {
235250 , processLabel :: Text
236251 , resolveConfPath :: FilePath
237252 , restartCount :: Int
238− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
239254 , mounts :: [Mount]
240255 }
241256 deriving (Eq, Show, Generic)
@@ -243,11 +258,11 @@ data ContainerDetails = ContainerDetails {
243258-- | Data type used for parsing the mount information from a container
244259-- list.
245260data Mount = Mount {
246− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
247262 , mountSource :: FilePath
248263 , mountDestination :: FilePath
249− , mountDriver :: Text
250− , mountMode :: Maybe VolumePermission -- apparently this can be null
264+ , mountDriver :: Maybe Text
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
251266 , mountRW :: Bool
252267 , mountPropogation :: Text
253268 }
@@ -255,14 +270,14 @@ data Mount = Mount {
255270
256271instance FromJSON Mount where
257272 parseJSON (JSON.Object o) = do
258− name <- o .: "Name"
273+ name <- o .:? "Name"
259274 src <- o .: "Source"
260275 dest <- o .: "Destination"
261− driver <- o .: "Driver"
262− mode <- o .: "Mode"
276+ driver <- o .:? "Driver"
277+ -- mode <- o .: "Mode"
263278 rw <- o .: "RW"
264279 prop <- o .: "Propagation"
265− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
266281 parseJSON _ = fail "Mount is not an object"
267282
268283-- | Data type used for parsing the container state from a list of
@@ -278,7 +293,7 @@ data ContainerState = ContainerState {
278293 , restarting :: Bool
279294 , running :: Bool
280295 , startedAt :: UTCTime
281− , status :: Status
296+ , state :: State
282297 }
283298 deriving (Eq, Show, Generic)
284299
@@ -508,7 +523,8 @@ data Container = Container
508523 , containerImageId :: ImageID
509524 , containerCommand :: Text
510525 , containerCreatedAt :: Int
511− , containerStatus :: Status
526+ , containerState :: State
527+ , containerStatus :: Maybe Text
512528 , containerPorts :: [ContainerPortInfo]
513529 , containerLabels :: [Label]
514530 , containerNetworks :: [Network]
@@ -516,13 +532,14 @@ data Container = Container
516532 } deriving (Show, Eq)
517533
518534instance FromJSON Container where
519− parseJSON (JSON.Object v) =
520− Container <$> (v .: "Id")
535+ parseJSON o@(JSON.Object v) =
536+ Container <$> parseJSON o
521537 <*> (v .: "Names")
522538 <*> (v .: "Image")
523− <*> (v .: "ImageID")
524− <*> (v .: "Command")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
540+ <*> (v .: "Command") -- Doesn't exist anymore
525541 <*> (v .: "Created")
542+ <*> (v .: "State")
526543 <*> (v .: "Status")
527544 <*> (v .: "Ports")
528545 <*> (v .: "Labels")
@@ -532,21 +549,20 @@ instance FromJSON Container where
532549 parseNetworks (JSON.Object v) =
533550 (v .: "Networks") >>= parseJSON
534551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
535−
536552 parseJSON _ = fail "Container: Not a JSON object."
537553
538−-- | Represents the status of the container life cycle.
539−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
540556 deriving (Eq, Show, Generic)
541557
542−instance FromJSON Status where
543− parseJSON (JSON.String "running") = return Running
544− 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.
545561 parseJSON (JSON.String "restarting") = return Restarting
546− parseJSON (JSON.String "paused") = return Paused
547− parseJSON (JSON.String "exited") = return Exited
548− parseJSON (JSON.String "dead") = return Dead
549− 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
550566
551567-- | Alias for representing a RepoDigest. We could newtype this and add
552568-- some validation.
@@ -607,20 +623,46 @@ instance FromJSON Image where
607623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
608624 parseJSON _ = fail "Failed to parse DockerImage."
609625
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+ ]
610649
611650-- | Options used for creating a Container.
612651data CreateOpts = CreateOpts {
613− containerConfig :: ContainerConfig
614− , hostConfig :: HostConfig
652+ containerConfig :: ContainerConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
615655 } deriving (Eq, Show)
616656
617657instance ToJSON CreateOpts where
618− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
619659 let ccJSON = toJSON cc
620660 let hcJSON = toJSON hc
621661 case ccJSON of
622662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
623− 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
624666 _ -> error "ContainerConfig is not an object." -- This should never happen.
625667
626668-- | Container configuration used for creating a container with sensible
@@ -642,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
642684 , cmd=[]
643685 , volumes=[]
644686 , workingDir=Nothing
645− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
646688 , networkDisabled=Nothing
647689 , macAddress=Nothing
648690 , labels=[]
@@ -655,7 +697,7 @@ defaultHostConfig = HostConfig {
655697 binds=[]
656698 , containerIDFile=Nothing
657699 , logConfig=LogDriverConfig JsonFile []
658− , networkMode=Bridge
700+ , networkMode=NetworkBridge
659701 , portBindings=[]
660702 , restartPolicy=RestartOff
661703 , volumeDriver=Nothing
@@ -695,14 +737,18 @@ defaultContainerResources = ContainerResources {
695737 , memory=Nothing
696738 , memoryReservation=Nothing
697739 , memorySwap=Nothing
698− , oomKillDisable=False
740+ , oomKillDisable=Just False
699741 , ulimits=[]
700742 }
701743
702744-- | Default create options when creating a container. You only need to
703745-- specify an image name and the rest is all sensible defaults.
704746defaultCreateOpts :: T.Text -> CreateOpts
705−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+ }
706752
707753-- | Override the key sequence for detaching a container.
708754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -716,7 +762,7 @@ defaultStartOpts :: StartOpts
716762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
717763
718764-- | Options for deleting a container.
719−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
720766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
721767 , force :: Bool -- ^ If the container is still running force deletion anyway.
722768 } deriving (Eq, Show)
@@ -746,8 +792,15 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
746792-- | Default options for deleting a container. Most of the time we DON'T
747793-- want to delete the container's volumes or force delete it if it's
748794-- running.
749−defaultDeleteOpts :: DeleteOpts
750−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
751804
752805-- | Timestamp alias.
753806type Timestamp = Integer
@@ -775,18 +828,50 @@ defaultLogOpts = LogOpts { stdout = True
775828 , tail = All
776829 }
777830
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+
778861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
779862-- | Set permissions on volumes that you mount in the container.
780863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
781864
782865instance ToJSON VolumePermission where
783866 toJSON ReadWrite = "rw"
784− toJSON ReadOnly = "ro"
867+ toJSON ReadOnly = "ro"
785868
786869instance FromJSON VolumePermission where
787870 parseJSON "rw" = return ReadWrite
788871 parseJSON "ro" = return ReadOnly
789− parseJSON _ = fail "Failed to parse VolumePermission"
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
874+ parseJSON _ = fail "Failed to parse VolumePermission"
790875
791876-- | Used for marking a directory in the container as "exposed" hence
792877-- taking it outside of the COW filesystem and making it mountable
@@ -808,8 +893,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
808893
809894instance {-# OVERLAPPING #-} FromJSON [Volume] where
810895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
811− parseJSON (JSON.Null) = return []
812− parseJSON _ = fail "Volume is not an object"
896+ parseJSON (JSON.Null) = return []
897+ parseJSON _ = fail "Volume is not an object"
813898
814899
815900data Bind = Bind { hostSrc :: Text
@@ -819,10 +904,10 @@ data Bind = Bind { hostSrc :: Text
819904
820905instance FromJSON Bind where
821906 parseJSON (JSON.String t) = case T.split (== ':') t of
822− [src, dest] -> return $ Bind src dest Nothing
907+ [src, dest] -> return $ Bind src dest Nothing
823908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
824909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
825− _ -> fail "Could not parse Bind"
910+ _ -> fail "Could not parse Bind"
826911 parseJSON _ = fail "Bind is not a string"
827912
828913data Device = Device {
@@ -845,15 +930,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
845930
846931instance FromJSON VolumeFrom where
847932 parseJSON (JSON.String t) = case T.split (== ':') t of
848− [vol] -> return $ VolumeFrom vol Nothing
933+ [vol] -> return $ VolumeFrom vol Nothing
849934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
850935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
851− _ -> fail "Could not parse VolumeFrom"
936+ _ -> fail "Could not parse VolumeFrom"
852937 parseJSON _ = fail "VolumeFrom is not a string"
853938
854939instance ToJSON VolumeFrom where
855940 toJSON (VolumeFrom n p) = case p of
856− Nothing -> toJSON $ n <> ":" <> "rw"
941+ Nothing -> toJSON $ n <> ":" <> "rw"
857942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
858943
859944instance ToJSON Bind where
@@ -865,40 +950,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
865950
866951instance FromJSON Link where
867952 parseJSON (JSON.String t) = case T.split (== ':') t of
868− [f] -> return $ Link f Nothing
953+ [f] -> return $ Link f Nothing
869954 [f,s] -> return $ Link f $ Just s
870− _ -> fail "Could not parse Link"
955+ _ -> fail "Could not parse Link"
871956 parseJSON _ = fail "Link is not a string"
872957
873958instance ToJSON Link where
874959 toJSON (Link n1 n2) = toJSON $ case n2 of
875960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
876− Just n -> T.concat[n1, ":", n] -- used specified name in container
961+ Just n -> T.concat[n1, ":", n] -- used specified name in container
877962
878963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
879964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
880965
881966instance FromJSON LogDriverType where
882967 parseJSON (JSON.String "json-file") = return JsonFile
883− parseJSON (JSON.String "syslog") = return Syslog
884− parseJSON (JSON.String "journald") = return Journald
885− parseJSON (JSON.String "gelf") = return Gelf
886− parseJSON (JSON.String "fluentd") = return Fluentd
887− parseJSON (JSON.String "awslogs") = return AwsLogs
888− parseJSON (JSON.String "splunk") = return Splunk
889− parseJSON (JSON.String "etwlogs") = return Etwlogs
890− parseJSON (JSON.String "none") = return LoggingDisabled
891− 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"
892977
893978instance ToJSON LogDriverType where
894− toJSON JsonFile = JSON.String "json-file"
895− toJSON Syslog = JSON.String "syslog"
896− toJSON Journald = JSON.String "journald"
897− toJSON Gelf = JSON.String "gelf"
898− toJSON Fluentd = JSON.String "fluentd"
899− toJSON AwsLogs = JSON.String "awslogs"
900− toJSON Splunk = JSON.String "splunk"
901− 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"
902987 toJSON LoggingDisabled = JSON.String "none"
903988
904989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -932,19 +1017,41 @@ instance FromJSON LogDriverConfig where
9321017 parseJSON _ = fail "LogDriverConfig is not an object"
9331018
9341019-- TODO: Add container:<name|id> mode
935−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
9361021 deriving (Eq, Show, Ord)
9371022
9381023instance FromJSON NetworkMode where
939− parseJSON (JSON.String "bridge") = return Bridge
940− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
941− parseJSON (JSON.String "none") = return NetworkDisabled
942− 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"
9431029
9441030instance ToJSON NetworkMode where
945− toJSON Bridge = JSON.String "bridge"
946− toJSON Host = JSON.String "host"
1031+ toJSON NetworkBridge = JSON.String "bridge"
1032+ toJSON NetworkHost = JSON.String "host"
9471033 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]
9481055
9491056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
9501057
@@ -960,7 +1067,7 @@ instance FromJSON PortType where
9601067 parseJSON val = case val of
9611068 "tcp" -> return TCP
9621069 "udp" -> return UDP
963− _ -> fail "PortType: Invalid port type."
1070+ _ -> fail "PortType: Invalid port type."
9641071
9651072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
9661073--
@@ -1090,7 +1197,7 @@ instance FromJSON RestartPolicy where
10901197 "on-failure" -> do
10911198 retry <- o .: "MaximumRetryCount"
10921199 return $ RestartOnFailure retry
1093− "off" -> return RestartOff
1200+ "no" -> return RestartOff
10941201 _ -> fail "Could not parse RestartPolicy"
10951202 parseJSON _ = fail "RestartPolicy is not an object"
10961203
@@ -1098,7 +1205,7 @@ instance ToJSON RestartPolicy where
10981205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
10991206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
11001207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1101− toJSON RestartOff = object ["Name" .= JSON.String "off"]
1208+ toJSON RestartOff = object ["Name" .= JSON.String "no"]
11021209
11031210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
11041211
@@ -1276,7 +1383,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
12761383data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
12771384
12781385instance ToJSON MemoryConstraint where
1279− toJSON (MemoryConstraint x B) = toJSON x
1386+ toJSON (MemoryConstraint x B) = toJSON x
12801387 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
12811388 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
12821389
@@ -1307,7 +1414,7 @@ data ContainerResources = ContainerResources {
13071414 , memoryReservation :: Maybe MemoryConstraint
13081415 , memorySwap :: Maybe MemoryConstraint
13091416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1310− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
13111418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
13121419 , ulimits :: [Ulimit]
13131420 -- TODO: Missing from 1.24
@@ -1345,7 +1452,7 @@ instance FromJSON EnvVar where
13451452 parseJSON _ = fail "EnvVar is not a string"
13461453
13471454instance ToJSON EnvVar where
1348− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
13491456
13501457-- | ExposedPort represents a port (and it's type)
13511458-- that a container should expose to other containers or the host system.
@@ -1385,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
13851492 where key (ExposedPort p t) = show p <> slash <> show t
13861493 slash = T.unpack "/"
13871494
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+
13881510data ContainerConfig = ContainerConfig {
13891511 hostname :: Maybe Text
13901512 , domainname :: Maybe Text
@@ -1403,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
14031525 , image :: Text
14041526 , volumes :: [Volume]
14051527 , workingDir :: Maybe FilePath
1406− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
14071529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
14081530 , macAddress :: Maybe Text
14091531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1411,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
14111533 , stopSignal :: Signal
14121534 } deriving (Eq, Show, Generic)
14131535
1536+
14141537instance ToJSON ContainerConfig where
14151538 toJSON = genericToJSON defaultOptions {
14161539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1432,7 +1555,7 @@ instance FromJSON ContainerConfig where
14321555 image <- o .: "Image"
14331556 volumes <- o .: "Volumes"
14341557 workingDir <- o .:? "WorkingDir"
1435− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
14361559 networkDisabled <- o .:? "networkDisabled"
14371560 macAddress <- o .:? "MacAddress"
14381561 labels <- o .:? "Labels" .!= []
@@ -1441,7 +1564,11 @@ instance FromJSON ContainerConfig where
14411564 macAddress labels stopSignal
14421565 parseJSON _ = fail "NetworkSettings is not an object."
14431566
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1569+#else
14441570parseIntegerText :: (Monad m) => Text -> m Integer
1571+#endif
14451572parseIntegerText t = case readMaybe $ T.unpack t of
14461573 Nothing ->
14471574 fail "Could not parse Integer"
@@ -1463,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
14631590-- | Helper function that return an empty dictionary "{}"
14641591emptyJsonObject :: JSON.Value
14651592emptyJsonObject = JSON.Object HM.empty
1466−