@@ -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
@@ -102,6 +112,7 @@ import Data.Scientific (floatingOrInteger)
102import Data.Text (Text)
112import Data.Text (Text)
103import qualified Data.Text as T
113import qualified Data.Text as T
104import Data.Time.Clock (UTCTime)
114import Data.Time.Clock (UTCTime)
115+import qualified Data.Vector as V
105import GHC.Generics (Generic)
116import GHC.Generics (Generic)
106import Prelude hiding (all, tail)
117import Prelude hiding (all, tail)
107import Text.Read (readMaybe)
118import Text.Read (readMaybe)
@@ -121,10 +132,13 @@ data Endpoint =
121 | UnpauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
122 | 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.
123 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
124− | DeleteContainerEndpoint DeleteOpts ContainerID
135+ | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
125 | InspectContainerEndpoint ContainerID
136 | InspectContainerEndpoint ContainerID
126 | BuildImageEndpoint BuildOpts FilePath
137 | BuildImageEndpoint BuildOpts FilePath
127 | 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
128 deriving (Eq, Show)
142 deriving (Eq, Show)
130-- | We should newtype this
144-- | We should newtype this
@@ -236,7 +250,7 @@ data ContainerDetails = ContainerDetails {
236 , processLabel :: Text
250 , processLabel :: Text
237 , resolveConfPath :: FilePath
251 , resolveConfPath :: FilePath
238 , restartCount :: Int
252 , restartCount :: Int
239− , state :: ContainerState
253+ , containerDetailsState :: ContainerState
240 , mounts :: [Mount]
254 , mounts :: [Mount]
242 deriving (Eq, Show, Generic)
256 deriving (Eq, Show, Generic)
@@ -244,11 +258,11 @@ data ContainerDetails = ContainerDetails {
244-- | Data type used for parsing the mount information from a container
258-- | Data type used for parsing the mount information from a container
246data Mount = Mount {
260data Mount = Mount {
247− mountName :: Text
261+ mountName :: Maybe Text -- this is optional
248 , mountSource :: FilePath
262 , mountSource :: FilePath
249 , mountDestination :: FilePath
263 , mountDestination :: FilePath
250− , mountDriver :: Text
264+ , mountDriver :: Maybe Text
251− , mountMode :: Maybe VolumePermission -- apparently this can be null
265+ -- , mountMode :: Maybe VolumePermission -- apparently this can be null
252 , mountRW :: Bool
266 , mountRW :: Bool
253 , mountPropogation :: Text
267 , mountPropogation :: Text
@@ -256,14 +270,14 @@ data Mount = Mount {
257instance FromJSON Mount where
271instance FromJSON Mount where
258 parseJSON (JSON.Object o) = do
272 parseJSON (JSON.Object o) = do
259− name <- o .: "Name"
273+ name <- o .:? "Name"
260 src <- o .: "Source"
274 src <- o .: "Source"
261 dest <- o .: "Destination"
275 dest <- o .: "Destination"
262− driver <- o .: "Driver"
276+ driver <- o .:? "Driver"
263− mode <- o .: "Mode"
277+ -- mode <- o .: "Mode"
264 rw <- o .: "RW"
278 rw <- o .: "RW"
265 prop <- o .: "Propagation"
279 prop <- o .: "Propagation"
266− return $ Mount name src dest driver mode rw prop
280+ return $ Mount name src dest driver rw prop
267 parseJSON _ = fail "Mount is not an object"
281 parseJSON _ = fail "Mount is not an object"
269-- | 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
@@ -279,7 +293,7 @@ data ContainerState = ContainerState {
279 , restarting :: Bool
293 , restarting :: Bool
280 , running :: Bool
294 , running :: Bool
281 , startedAt :: UTCTime
295 , startedAt :: UTCTime
282− , status :: Status
296+ , state :: State
284 deriving (Eq, Show, Generic)
298 deriving (Eq, Show, Generic)
@@ -509,7 +523,8 @@ data Container = Container
509 , containerImageId :: ImageID
523 , containerImageId :: ImageID
510 , containerCommand :: Text
524 , containerCommand :: Text
511 , containerCreatedAt :: Int
525 , containerCreatedAt :: Int
526+ , containerState :: State
512− , containerStatus :: Status
527+ , containerStatus :: Maybe Text
513 , containerPorts :: [ContainerPortInfo]
528 , containerPorts :: [ContainerPortInfo]
514 , containerLabels :: [Label]
529 , containerLabels :: [Label]
515 , containerNetworks :: [Network]
530 , containerNetworks :: [Network]
@@ -517,13 +532,14 @@ data Container = Container
517 } deriving (Show, Eq)
532 } deriving (Show, Eq)
519instance FromJSON Container where
534instance FromJSON Container where
520− parseJSON (JSON.Object v) =
535+ parseJSON o@(JSON.Object v) =
521− Container <$> (v .: "Id")
536+ Container <$> parseJSON o
522 <*> (v .: "Names")
537 <*> (v .: "Names")
523 <*> (v .: "Image")
538 <*> (v .: "Image")
524− <*> (v .: "ImageID")
539+ <*> (v .: "ImageID") -- Doesn't exist anymore
525− <*> (v .: "Command")
540+ <*> (v .: "Command") -- Doesn't exist anymore
526 <*> (v .: "Created")
541 <*> (v .: "Created")
527 <*> (v .: "Status")
543 <*> (v .: "Status")
528 <*> (v .: "Ports")
544 <*> (v .: "Ports")
529 <*> (v .: "Labels")
545 <*> (v .: "Labels")
@@ -533,21 +549,20 @@ instance FromJSON Container where
533 parseNetworks (JSON.Object v) =
549 parseNetworks (JSON.Object v) =
534 (v .: "Networks") >>= parseJSON
550 (v .: "Networks") >>= parseJSON
535 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
537 parseJSON _ = fail "Container: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
539−-- | Represents the status of the container life cycle.
554+-- | Represents the state of the container life cycle.
540−data Status = Created | Restarting | Running | Paused | Exited | Dead
555+data State = Created | Restarting | Running | Paused | Exited | Dead
541 deriving (Eq, Show, Generic)
556 deriving (Eq, Show, Generic)
543−instance FromJSON Status where
558+instance FromJSON State where
544 parseJSON (JSON.String "running") = return Running
559 parseJSON (JSON.String "running") = return Running
545 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.
546 parseJSON (JSON.String "restarting") = return Restarting
561 parseJSON (JSON.String "restarting") = return Restarting
547 parseJSON (JSON.String "paused") = return Paused
562 parseJSON (JSON.String "paused") = return Paused
548 parseJSON (JSON.String "exited") = return Exited
563 parseJSON (JSON.String "exited") = return Exited
549 parseJSON (JSON.String "dead") = return Dead
564 parseJSON (JSON.String "dead") = return Dead
550− parseJSON _ = fail "Unknown Status"
565+ parseJSON s = fail $ "Unknown Status: " ++ show s
552-- | Alias for representing a RepoDigest. We could newtype this and add
567-- | Alias for representing a RepoDigest. We could newtype this and add
553-- some validation.
568-- some validation.
@@ -608,20 +623,46 @@ instance FromJSON Image where
608 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
609 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
612-- | Options used for creating a Container.
650-- | Options used for creating a Container.
613data CreateOpts = CreateOpts {
651data CreateOpts = CreateOpts {
614− containerConfig :: ContainerConfig
652+ containerConfig :: ContainerConfig
615− , hostConfig :: HostConfig
653+ , hostConfig :: HostConfig
654+ , networkingConfig :: NetworkingConfig
616 } deriving (Eq, Show)
655 } deriving (Eq, Show)
618instance ToJSON CreateOpts where
657instance ToJSON CreateOpts where
619− toJSON (CreateOpts cc hc) = do
658+ toJSON (CreateOpts cc hc nc) = do
620 let ccJSON = toJSON cc
659 let ccJSON = toJSON cc
621 let hcJSON = toJSON hc
660 let hcJSON = toJSON hc
622 case ccJSON of
661 case ccJSON of
623 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
624− JSON.Object $ HM.insert "HostConfig" hcJSON o
663+ let o1 = HM.insert "HostConfig" hcJSON o
664+ let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
625 _ -> error "ContainerConfig is not an object." -- This should never happen.
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
627-- | Container configuration used for creating a container with sensible
668-- | Container configuration used for creating a container with sensible
@@ -643,7 +684,7 @@ defaultContainerConfig imageName = ContainerConfig {
644 , volumes=[]
685 , volumes=[]
645 , workingDir=Nothing
686 , workingDir=Nothing
646− , entrypoint=Nothing
687+ , entrypoint=Entrypoint []
647 , networkDisabled=Nothing
688 , networkDisabled=Nothing
648 , macAddress=Nothing
689 , macAddress=Nothing
649 , labels=[]
690 , labels=[]
@@ -656,7 +697,7 @@ defaultHostConfig = HostConfig {
657 , containerIDFile=Nothing
698 , containerIDFile=Nothing
658 , logConfig=LogDriverConfig JsonFile []
699 , logConfig=LogDriverConfig JsonFile []
659− , networkMode=Bridge
700+ , networkMode=NetworkBridge
660 , portBindings=[]
701 , portBindings=[]
661 , restartPolicy=RestartOff
702 , restartPolicy=RestartOff
662 , volumeDriver=Nothing
703 , volumeDriver=Nothing
@@ -696,14 +737,18 @@ defaultContainerResources = ContainerResources {
696 , memory=Nothing
737 , memory=Nothing
697 , memoryReservation=Nothing
738 , memoryReservation=Nothing
698 , memorySwap=Nothing
739 , memorySwap=Nothing
699− , oomKillDisable=False
740+ , oomKillDisable=Just False
700 , ulimits=[]
741 , ulimits=[]
703-- | Default create options when creating a container. You only need to
744-- | Default create options when creating a container. You only need to
704-- specify an image name and the rest is all sensible defaults.
745-- specify an image name and the rest is all sensible defaults.
705defaultCreateOpts :: T.Text -> CreateOpts
746defaultCreateOpts :: T.Text -> CreateOpts
747+defaultCreateOpts imageName = CreateOpts
706−defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
748+ { containerConfig = defaultContainerConfig imageName
749+ , hostConfig = defaultHostConfig
750+ , networkingConfig = NetworkingConfig HM.empty
708-- | Override the key sequence for detaching a container.
753-- | Override the key sequence for detaching a container.
709-- 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 _.
@@ -717,7 +762,7 @@ defaultStartOpts :: StartOpts
717defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
719-- | Options for deleting a container.
764-- | Options for deleting a container.
720−data DeleteOpts = DeleteOpts {
765+data ContainerDeleteOpts = ContainerDeleteOpts {
721 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
722 , force :: Bool -- ^ If the container is still running force deletion anyway.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
723 } deriving (Eq, Show)
768 } deriving (Eq, Show)
@@ -747,8 +792,15 @@ defaultBuildOpts nameTag = BuildOpts { buildImageName = nameTag
747-- | 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
748-- 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
749-- running.
794-- running.
750−defaultDeleteOpts :: DeleteOpts
795+defaultContainerDeleteOpts :: ContainerDeleteOpts
751−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
753-- | Timestamp alias.
805-- | Timestamp alias.
754type Timestamp = Integer
806type Timestamp = Integer
@@ -776,6 +828,36 @@ defaultLogOpts = LogOpts { stdout = True
776 , 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
779-- 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")
780-- | Set permissions on volumes that you mount in the container.
862-- | Set permissions on volumes that you mount in the container.
781data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
@@ -787,6 +869,8 @@ instance ToJSON VolumePermission where
787instance FromJSON VolumePermission where
869instance FromJSON VolumePermission where
788 parseJSON "rw" = return ReadWrite
870 parseJSON "rw" = return ReadWrite
789 parseJSON "ro" = return ReadOnly
871 parseJSON "ro" = return ReadOnly
872+ parseJSON "RW" = return ReadWrite
873+ parseJSON "RO" = return ReadOnly
790 parseJSON _ = fail "Failed to parse VolumePermission"
874 parseJSON _ = fail "Failed to parse VolumePermission"
792-- | Used for marking a directory in the container as "exposed" hence
876-- | Used for marking a directory in the container as "exposed" hence
@@ -933,19 +1017,41 @@ instance FromJSON LogDriverConfig where
933 parseJSON _ = fail "LogDriverConfig is not an object"
1017 parseJSON _ = fail "LogDriverConfig is not an object"
935-- TODO: Add container:<name|id> mode
1019-- TODO: Add container:<name|id> mode
936−data NetworkMode = Bridge | Host | NetworkDisabled
1020+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
937 deriving (Eq, Show, Ord)
1021 deriving (Eq, Show, Ord)
939instance FromJSON NetworkMode where
1023instance FromJSON NetworkMode where
940− parseJSON (JSON.String "bridge") = return Bridge
1024+ parseJSON (JSON.String "bridge") = return NetworkBridge
941− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1025+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
942 parseJSON (JSON.String "none") = return NetworkDisabled
1026 parseJSON (JSON.String "none") = return NetworkDisabled
1027+ parseJSON (JSON.String n) = return $ NetworkNamed n
943 parseJSON _ = fail "Unknown NetworkMode"
1028 parseJSON _ = fail "Unknown NetworkMode"
945instance ToJSON NetworkMode where
1030instance ToJSON NetworkMode where
946− toJSON Bridge = JSON.String "bridge"
1031+ toJSON NetworkBridge = JSON.String "bridge"
947− toJSON Host = JSON.String "host"
1032+ toJSON NetworkHost = JSON.String "host"
948− 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]
950data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1308,7 +1414,7 @@ data ContainerResources = ContainerResources {
1308 , memoryReservation :: Maybe MemoryConstraint
1414 , memoryReservation :: Maybe MemoryConstraint
1309 , memorySwap :: Maybe MemoryConstraint
1415 , memorySwap :: Maybe MemoryConstraint
1310 -- , 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.
1311− , oomKillDisable :: Bool
1417+ , oomKillDisable :: Maybe Bool
1312 -- , 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.
1313 , ulimits :: [Ulimit]
1419 , ulimits :: [Ulimit]
1314 -- TODO: Missing from 1.24
1420 -- TODO: Missing from 1.24
@@ -1346,7 +1452,7 @@ instance FromJSON EnvVar where
1346 parseJSON _ = fail "EnvVar is not a string"
1452 parseJSON _ = fail "EnvVar is not a string"
1348instance ToJSON EnvVar where
1454instance ToJSON EnvVar where
1349− toJSON (EnvVar n v) = object [n .= v]
1455+ toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1351-- | ExposedPort represents a port (and it's type)
1457-- | ExposedPort represents a port (and it's type)
1352-- 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.
@@ -1386,6 +1492,21 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1386 where key (ExposedPort p t) = show p <> slash <> show t
1492 where key (ExposedPort p t) = show p <> slash <> show t
1387 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"
1389data ContainerConfig = ContainerConfig {
1510data ContainerConfig = ContainerConfig {
1390 hostname :: Maybe Text
1511 hostname :: Maybe Text
1391 , domainname :: Maybe Text
1512 , domainname :: Maybe Text
@@ -1404,7 +1525,7 @@ data ContainerConfig = ContainerConfig {
1404 , image :: Text
1525 , image :: Text
1405 , volumes :: [Volume]
1526 , volumes :: [Volume]
1406 , workingDir :: Maybe FilePath
1527 , workingDir :: Maybe FilePath
1407− , entrypoint :: Maybe Text -- Can be null?
1528+ , entrypoint :: Entrypoint
1408 , 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?
1409 , macAddress :: Maybe Text
1530 , macAddress :: Maybe Text
1410 -- , 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.
@@ -1412,6 +1533,7 @@ data ContainerConfig = ContainerConfig {
1412 , stopSignal :: Signal
1533 , stopSignal :: Signal
1413 } deriving (Eq, Show, Generic)
1534 } deriving (Eq, Show, Generic)
1415instance ToJSON ContainerConfig where
1537instance ToJSON ContainerConfig where
1416 toJSON = genericToJSON defaultOptions {
1538 toJSON = genericToJSON defaultOptions {
1417 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1433,7 +1555,7 @@ instance FromJSON ContainerConfig where
1433 image <- o .: "Image"
1555 image <- o .: "Image"
1434 volumes <- o .: "Volumes"
1556 volumes <- o .: "Volumes"
1435 workingDir <- o .:? "WorkingDir"
1557 workingDir <- o .:? "WorkingDir"
1436− entrypoint <- o .:? "Entrypoint"
1558+ entrypoint <- o .: "Entrypoint"
1437 networkDisabled <- o .:? "networkDisabled"
1559 networkDisabled <- o .:? "networkDisabled"
1438 macAddress <- o .:? "MacAddress"
1560 macAddress <- o .:? "MacAddress"
1439 labels <- o .:? "Labels" .!= []
1561 labels <- o .:? "Labels" .!= []
@@ -1442,7 +1564,11 @@ instance FromJSON ContainerConfig where
1442 macAddress labels stopSignal
1564 macAddress labels stopSignal
1443 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
1445parseIntegerText :: (Monad m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1446parseIntegerText t = case readMaybe $ T.unpack t of
1572parseIntegerText t = case readMaybe $ T.unpack t of
1447 Nothing ->
1573 Nothing ->
1448 fail "Could not parse Integer"
1574 fail "Could not parse Integer"
@@ -1464,4 +1590,3 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1464-- | Helper function that return an empty dictionary "{}"
1590-- | Helper function that return an empty dictionary "{}"
1465emptyJsonObject :: JSON.Value
1591emptyJsonObject :: JSON.Value
1466emptyJsonObject = JSON.Object HM.empty
1592emptyJsonObject = JSON.Object HM.empty