@@ -11,6 +11,9 @@ module Docker.Client.Types (
12 , fromImageID
12 , fromImageID
13 , toImageID
13 , toImageID
14 , Timeout(..)
17 , Timeout(..)
15 , StatusCode(..)
18 , StatusCode(..)
16 , Signal(..)
19 , Signal(..)
@@ -23,11 +26,12 @@ module Docker.Client.Types (
23 , ContainerPortInfo(..)
26 , ContainerPortInfo(..)
24 , Container(..)
27 , Container(..)
25 , ContainerState(..)
28 , ContainerState(..)
26− , Status(..)
29+ , State(..)
28 , Label(..)
31 , Label(..)
30 , Image(..)
33 , Image(..)
31 , dropImagePrefix
35 , dropImagePrefix
32 , CreateOpts(..)
36 , CreateOpts(..)
33 , BuildOpts(..)
37 , BuildOpts(..)
@@ -36,12 +40,16 @@ module Docker.Client.Types (
36 , DetachKeys(..)
40 , DetachKeys(..)
37 , StartOpts(..)
41 , StartOpts(..)
38 , defaultStartOpts
42 , defaultStartOpts
39− , DeleteOpts(..)
43+ , ContainerDeleteOpts(..)
40− , defaultDeleteOpts
44+ , defaultContainerDeleteOpts
45+ , ImageDeleteOpts(..)
46+ , defaultImageDeleteOpts
41 , Timestamp
47 , Timestamp
42 , TailLogOpt(..)
48 , TailLogOpt(..)
43 , LogOpts(..)
49 , LogOpts(..)
44 , defaultLogOpts
50 , defaultLogOpts
51+ , CreateNetworkOpts(..)
52+ , defaultCreateNetworkOpts
45 , VolumePermission(..)
53 , VolumePermission(..)
46 , Bind(..)
54 , Bind(..)
47 , Volume(..)
55 , Volume(..)
@@ -67,6 +75,8 @@ module Docker.Client.Types (
67 , UTSMode(..)
75 , UTSMode(..)
68 , HostConfig(..)
76 , HostConfig(..)
69 , defaultHostConfig
77 , defaultHostConfig
78+ , NetworkingConfig(..)
70 , Ulimit(..)
80 , Ulimit(..)
71 , ContainerResources(..)
81 , ContainerResources(..)
72 , defaultContainerResources
82 , defaultContainerResources
@@ -96,13 +106,13 @@ import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
96import qualified Data.Aeson as JSON
106import qualified Data.Aeson as JSON
97import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
98import Data.Char (isAlphaNum, toUpper)
108import Data.Char (isAlphaNum, toUpper)
99−import Data.Foldable (asum)
100import qualified Data.HashMap.Strict as HM
109import qualified Data.HashMap.Strict as HM
101import Data.Monoid ((<>))
110import Data.Monoid ((<>))
102import Data.Scientific (floatingOrInteger)
111import Data.Scientific (floatingOrInteger)
103import Data.Text (Text)
112import Data.Text (Text)
104import qualified Data.Text as T
113import qualified Data.Text as T
105import Data.Time.Clock (UTCTime)
114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
106import GHC.Generics (Generic)
116import GHC.Generics (Generic)
107import Prelude hiding (all, tail)
117import Prelude hiding (all, tail)
108import Text.Read (readMaybe)
118import Text.Read (readMaybe)
@@ -122,10 +132,13 @@ data Endpoint =
122 | UnpauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
123 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
124 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
125− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
126 | InspectContainerEndpoint ContainerID
136 | InspectContainerEndpoint ContainerID
127 | BuildImageEndpoint BuildOpts FilePath
137 | BuildImageEndpoint BuildOpts FilePath
128 | CreateImageEndpoint T.Text Tag (Maybe T.Text) -- ^ Either pull an image from docker hub or imports an image from a tarball (or URL)
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
129 deriving (Eq, Show)
142 deriving (Eq, Show)
131-- | We should newtype this
144-- | We should newtype this
@@ -237,7 +250,7 @@ data ContainerDetails = ContainerDetails {
237 , processLabel :: Text
250 , processLabel :: Text
238 , resolveConfPath :: FilePath
251 , resolveConfPath :: FilePath
239 , restartCount :: Int
252 , restartCount :: Int
240− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
241 , mounts :: [Mount]
254 , mounts :: [Mount]
243 deriving (Eq, Show, Generic)
256 deriving (Eq, Show, Generic)
@@ -245,11 +258,11 @@ data ContainerDetails = ContainerDetails {
245-- | Data type used for parsing the mount information from a container
258-- | Data type used for parsing the mount information from a container
247data Mount = Mount {
260data Mount = Mount {
248− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
249 , mountSource :: FilePath
262 , mountSource :: FilePath
250 , mountDestination :: FilePath
263 , mountDestination :: FilePath
251− , mountDriver :: Text
264+ , mountDriver :: Maybe Text
252− , mountMode :: Maybe VolumePermission -- apparently this can be null
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
253 , mountRW :: Bool
266 , mountRW :: Bool
254 , mountPropogation :: Text
267 , mountPropogation :: Text
@@ -257,14 +270,14 @@ data Mount = Mount {
258instance FromJSON Mount where
271instance FromJSON Mount where
259 parseJSON (JSON.Object o) = do
272 parseJSON (JSON.Object o) = do
260− name <- o .: "Name"
273+ name <- o .:? "Name"
261 src <- o .: "Source"
274 src <- o .: "Source"
262 dest <- o .: "Destination"
275 dest <- o .: "Destination"
263− driver <- o .: "Driver"
276+ driver <- o .:? "Driver"
264− mode <- o .: "Mode"
277+ -- mode <- o .: "Mode"
265 rw <- o .: "RW"
278 rw <- o .: "RW"
266 prop <- o .: "Propagation"
279 prop <- o .: "Propagation"
267− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
268 parseJSON _ = fail "Mount is not an object"
281 parseJSON _ = fail "Mount is not an object"
270-- | Data type used for parsing the container state from a list of
283-- | Data type used for parsing the container state from a list of
@@ -280,7 +293,7 @@ data ContainerState = ContainerState {
280 , restarting :: Bool
293 , restarting :: Bool
281 , running :: Bool
294 , running :: Bool
282 , startedAt :: UTCTime
295 , startedAt :: UTCTime
283− , status :: Status
296+ , state :: State
285 deriving (Eq, Show, Generic)
298 deriving (Eq, Show, Generic)
@@ -510,7 +523,8 @@ data Container = Container
510 , containerImageId :: ImageID
523 , containerImageId :: ImageID
511 , containerCommand :: Text
524 , containerCommand :: Text
512 , containerCreatedAt :: Int
525 , containerCreatedAt :: Int
526+ , containerState :: State
513− , containerStatus :: Status
527+ , containerStatus :: Maybe Text
514 , containerPorts :: [ContainerPortInfo]
528 , containerPorts :: [ContainerPortInfo]
515 , containerLabels :: [Label]
529 , containerLabels :: [Label]
516 , containerNetworks :: [Network]
530 , containerNetworks :: [Network]
@@ -518,13 +532,14 @@ data Container = Container
518 } deriving (Show, Eq)
532 } deriving (Show, Eq)
520instance FromJSON Container where
534instance FromJSON Container where
521− parseJSON (JSON.Object v) =
535+ parseJSON o@(JSON.Object v) =
522− Container <$> (v .: "Id")
536+ Container <$> parseJSON o
523 <*> (v .: "Names")
537 <*> (v .: "Names")
524 <*> (v .: "Image")
538 <*> (v .: "Image")
525− <*> (v .: "ImageID")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
526− <*> (v .: "Command")
540+ <*> (v .: "Command") -- Doesn't exist anymore
527 <*> (v .: "Created")
541 <*> (v .: "Created")
528 <*> (v .: "Status")
543 <*> (v .: "Status")
529 <*> (v .: "Ports")
544 <*> (v .: "Ports")
530 <*> (v .: "Labels")
545 <*> (v .: "Labels")
@@ -534,21 +549,20 @@ instance FromJSON Container where
534 parseNetworks (JSON.Object v) =
549 parseNetworks (JSON.Object v) =
535 (v .: "Networks") >>= parseJSON
550 (v .: "Networks") >>= parseJSON
536 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
538 parseJSON _ = fail "Container: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
540−-- | Represents the status of the container life cycle.
554+-- | Represents the state of the container life cycle.
541−data Status = Created | Restarting | Running | Paused | Exited | Dead
555+data State = Created | Restarting | Running | Paused | Exited | Dead
542 deriving (Eq, Show, Generic)
556 deriving (Eq, Show, Generic)
544−instance FromJSON Status where
558+instance FromJSON State where
545 parseJSON (JSON.String "running") = return Running
559 parseJSON (JSON.String "running") = return Running
546 parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
560 parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
547 parseJSON (JSON.String "restarting") = return Restarting
561 parseJSON (JSON.String "restarting") = return Restarting
548 parseJSON (JSON.String "paused") = return Paused
562 parseJSON (JSON.String "paused") = return Paused
549 parseJSON (JSON.String "exited") = return Exited
563 parseJSON (JSON.String "exited") = return Exited
550 parseJSON (JSON.String "dead") = return Dead
564 parseJSON (JSON.String "dead") = return Dead
551− parseJSON _ = fail "Unknown Status"
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
553-- | Alias for representing a RepoDigest. We could newtype this and add
567-- | Alias for representing a RepoDigest. We could newtype this and add
554-- some validation.
568-- some validation.
@@ -609,20 +623,46 @@ instance FromJSON Image where
609 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
610 parseJSON _ = fail "Failed to parse DockerImage."
624 parseJSON _ = fail "Failed to parse DockerImage."
626+-- | Alias for Aliases.
629+-- | EndpointsConfig is container configuration for a specific network
630+newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
632+instance ToJSON EndpointConfig where
633+ toJSON (EndpointConfig aliases) = JSON.object
634+ [ "Aliases" .= aliases
637+-- | Alias for endpoint name
638+type EndpointName = Text
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)
645+instance ToJSON NetworkingConfig where
646+ toJSON (NetworkingConfig endpointsConfig) = JSON.object
647+ [ "EndpointsConfig" .= endpointsConfig
613-- | Options used for creating a Container.
650-- | Options used for creating a Container.
614data CreateOpts = CreateOpts {
651data CreateOpts = CreateOpts {
615− containerConfig :: ContainerConfig
652+ containerConfig :: ContainerConfig
616− , hostConfig :: HostConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
617 } deriving (Eq, Show)
655 } deriving (Eq, Show)
619instance ToJSON CreateOpts where
657instance ToJSON CreateOpts where
620− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
621 let ccJSON = toJSON cc
659 let ccJSON = toJSON cc
622 let hcJSON = toJSON hc
660 let hcJSON = toJSON hc
623 case ccJSON of
661 case ccJSON of
624 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
625− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
626 _ -> error "ContainerConfig is not an object." -- This should never happen.
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
628-- | Container configuration used for creating a container with sensible
668-- | Container configuration used for creating a container with sensible
@@ -644,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
645 , volumes=[]
685 , volumes=[]
646 , workingDir=Nothing
686 , workingDir=Nothing
647− , entrypoint=[]
687+ , entrypoint=Entrypoint []
648 , networkDisabled=Nothing
688 , networkDisabled=Nothing
649 , macAddress=Nothing
689 , macAddress=Nothing
650 , labels=[]
690 , labels=[]
@@ -657,7 +697,7 @@ defaultHostConfig = HostConfig {
658 , containerIDFile=Nothing
698 , containerIDFile=Nothing
659 , logConfig=LogDriverConfig JsonFile []
699 , logConfig=LogDriverConfig JsonFile []
660− , networkMode=Bridge
700+ , networkMode=NetworkBridge
661 , portBindings=[]
701 , portBindings=[]
662 , restartPolicy=RestartOff
702 , restartPolicy=RestartOff
663 , volumeDriver=Nothing
703 , volumeDriver=Nothing
@@ -697,14 +737,18 @@ defaultContainerResources = ContainerResources {
697 , memory=Nothing
737 , memory=Nothing
698 , memoryReservation=Nothing
738 , memoryReservation=Nothing
699 , memorySwap=Nothing
739 , memorySwap=Nothing
700− , oomKillDisable=False
740+ , oomKillDisable=Just False
701 , ulimits=[]
741 , ulimits=[]
704-- | Default create options when creating a container. You only need to
744-- | Default create options when creating a container. You only need to
705-- specify an image name and the rest is all sensible defaults.
745-- specify an image name and the rest is all sensible defaults.
706defaultCreateOpts :: T.Text -> CreateOpts
746defaultCreateOpts :: T.Text -> CreateOpts
747+defaultCreateOpts imageName = CreateOpts
707−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
709-- | Override the key sequence for detaching a container.
753-- | Override the key sequence for detaching a container.
710-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -718,7 +762,7 @@ defaultStartOpts :: StartOpts
718defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
720-- | Options for deleting a container.
764-- | Options for deleting a container.
721−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
722 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
723 , force :: Bool -- ^ If the container is still running force deletion anyway.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
724 } deriving (Eq, Show)
768 } deriving (Eq, Show)
@@ -748,8 +792,15 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
748-- | Default options for deleting a container. Most of the time we DON'T
792-- | Default options for deleting a container. Most of the time we DON'T
749-- want to delete the container's volumes or force delete it if it's
793-- want to delete the container's volumes or force delete it if it's
750-- running.
794-- running.
751−defaultDeleteOpts :: DeleteOpts
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
752−defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
796+defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
798+-- | Image delete opts
799+data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
801+-- | Sane image deletion defaults
802+defaultImageDeleteOpts :: ImageDeleteOpts
803+defaultImageDeleteOpts = ImageDeleteOpts
754-- | Timestamp alias.
805-- | Timestamp alias.
755type Timestamp = Integer
806type Timestamp = Integer
@@ -777,6 +828,36 @@ defaultLogOpts = LogOpts { stdout = True
777 , tail = All
828 , tail = All
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)
840+-- | Sensible defalut for create network options
841+defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842+defaultCreateNetworkOpts name =
844+ { createNetworkName = name
845+ , createNetworkCheckDuplicate = False
846+ , createNetworkDriver = "bridge"
847+ , createNetworkInternal = True
848+ , createNetworkEnableIPv6 = False
851+instance ToJSON CreateNetworkOpts where
854+ [ "Name" .= createNetworkName opts
855+ , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856+ , "Driver" .= createNetworkDriver opts
857+ , "Internal" .= createNetworkInternal opts
858+ , "EnableIPv6" .= createNetworkEnableIPv6 opts
780-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
781-- | Set permissions on volumes that you mount in the container.
862-- | Set permissions on volumes that you mount in the container.
782data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -788,6 +869,8 @@ instance ToJSON VolumePermission where
788instance FromJSON VolumePermission where
869instance FromJSON VolumePermission where
789 parseJSON "rw" = return ReadWrite
870 parseJSON "rw" = return ReadWrite
790 parseJSON "ro" = return ReadOnly
871 parseJSON "ro" = return ReadOnly
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
791 parseJSON _ = fail "Failed to parse VolumePermission"
874 parseJSON _ = fail "Failed to parse VolumePermission"
793-- | Used for marking a directory in the container as "exposed" hence
876-- | Used for marking a directory in the container as "exposed" hence
@@ -934,19 +1017,41 @@ instance FromJSON LogDriverConfig where
934 parseJSON _ = fail "LogDriverConfig is not an object"
1017 parseJSON _ = fail "LogDriverConfig is not an object"
936-- TODO: Add container:<name|id> mode
1019-- TODO: Add container:<name|id> mode
937−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
938 deriving (Eq, Show, Ord)
1021 deriving (Eq, Show, Ord)
940instance FromJSON NetworkMode where
1023instance FromJSON NetworkMode where
941− parseJSON (JSON.String "bridge") = return Bridge
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
942− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
943 parseJSON (JSON.String "none") = return NetworkDisabled
1026 parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
944 parseJSON _ = fail "Unknown NetworkMode"
1028 parseJSON _ = fail "Unknown NetworkMode"
946instance ToJSON NetworkMode where
1030instance ToJSON NetworkMode where
947− toJSON Bridge = JSON.String "bridge"
1031+ toJSON NetworkBridge = JSON.String "bridge"
948− toJSON Host = JSON.String "host"
1032+ toJSON NetworkHost = JSON.String "host"
949− toJSON NetworkDisabled = JSON.String "none"
1033+ toJSON NetworkDisabled = JSON.String "none"
1034+ toJSON (NetworkNamed n) = JSON.String n
1036+newtype NetworkID = NetworkID Text
1037+ deriving (Eq, Show)
1039+-- | Used for extracting the id of the container from the newtype
1040+fromNetworkID :: NetworkID -> Text
1041+fromNetworkID (NetworkID t) = t
1043+-- | Used for parsing a Text value into a NetworkID.
1044+toNetworkID :: Text -> Maybe NetworkID
1045+toNetworkID t = Just $ NetworkID t
1047+instance FromJSON NetworkID where
1048+ parseJSON (JSON.Object o) = do
1050+ return $ NetworkID nid
1051+ parseJSON _ = fail "NetworkID is not an object."
1053+instance ToJSON NetworkID where
1054+ toJSON (NetworkID nid) = object ["Id" .= nid]
951data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1309,7 +1414,7 @@ data ContainerResources = ContainerResources {
1309 , memoryReservation :: Maybe MemoryConstraint
1414 , memoryReservation :: Maybe MemoryConstraint
1310 , memorySwap :: Maybe MemoryConstraint
1415 , memorySwap :: Maybe MemoryConstraint
1311 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1312− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
1313 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1314 , ulimits :: [Ulimit]
1419 , ulimits :: [Ulimit]
1315 -- TODO: Missing from 1.24
1420 -- TODO: Missing from 1.24
@@ -1347,7 +1452,7 @@ instance FromJSON EnvVar where
1347 parseJSON _ = fail "EnvVar is not a string"
1452 parseJSON _ = fail "EnvVar is not a string"
1349instance ToJSON EnvVar where
1454instance ToJSON EnvVar where
1350− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1352-- | ExposedPort represents a port (and it's type)
1457-- | ExposedPort represents a port (and it's type)
1353-- that a container should expose to other containers or the host system.
1458-- that a container should expose to other containers or the host system.
@@ -1387,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1387 where key (ExposedPort p t) = show p <> slash <> show t
1492 where key (ExposedPort p t) = show p <> slash <> show t
1388 slash = T.unpack "/"
1493 slash = T.unpack "/"
1495+data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1497+instance ToJSON Entrypoint where
1498+ toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499+ toJSON (Entrypoint []) = JSON.Null
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"
1390data ContainerConfig = ContainerConfig {
1510data ContainerConfig = ContainerConfig {
1391 hostname :: Maybe Text
1511 hostname :: Maybe Text
1392 , domainname :: Maybe Text
1512 , domainname :: Maybe Text
@@ -1405,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
1405 , image :: Text
1525 , image :: Text
1406 , volumes :: [Volume]
1526 , volumes :: [Volume]
1407 , workingDir :: Maybe FilePath
1527 , workingDir :: Maybe FilePath
1408− , entrypoint :: [Text]
1528+ , entrypoint :: Entrypoint
1409 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1410 , macAddress :: Maybe Text
1530 , macAddress :: Maybe Text
1411 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1413,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
1413 , stopSignal :: Signal
1533 , stopSignal :: Signal
1414 } deriving (Eq, Show, Generic)
1534 } deriving (Eq, Show, Generic)
1416instance ToJSON ContainerConfig where
1537instance ToJSON ContainerConfig where
1417 toJSON = genericToJSON defaultOptions {
1538 toJSON = genericToJSON defaultOptions {
1418 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1434,9 +1555,7 @@ instance FromJSON ContainerConfig where
1434 image <- o .: "Image"
1555 image <- o .: "Image"
1435 volumes <- o .: "Volumes"
1556 volumes <- o .: "Volumes"
1436 workingDir <- o .:? "WorkingDir"
1557 workingDir <- o .:? "WorkingDir"
1437− entrypoint <- asum [ o .:? "Entrypoint" .!= []
1438− , (:[]) <$> o .: "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
1440 networkDisabled <- o .:? "networkDisabled"
1559 networkDisabled <- o .:? "networkDisabled"
1441 macAddress <- o .:? "MacAddress"
1560 macAddress <- o .:? "MacAddress"
1442 labels <- o .:? "Labels" .!= []
1561 labels <- o .:? "Labels" .!= []
@@ -1445,7 +1564,11 @@ instance FromJSON ContainerConfig where
1445 macAddress labels stopSignal
1564 macAddress labels stopSignal
1446 parseJSON _ = fail "NetworkSettings is not an object."
1565 parseJSON _ = fail "NetworkSettings is not an object."
1567+#if MIN_VERSION_base(4,13,0)
1568+parseIntegerText :: (MonadFail m) => Text -> m Integer
1448parseIntegerText :: (Monad m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1449parseIntegerText t = case readMaybe $ T.unpack t of
1572parseIntegerText t = case readMaybe $ T.unpack t of
1450 Nothing ->
1573 Nothing ->
1451 fail "Could not parse Integer"
1574 fail "Could not parse Integer"