@@ -11,11 +11,7 @@ module Docker.Client.Types (
12 , fromImageID
12 , fromImageID
13 , toImageID
13 , toImageID
17 , Timeout(..)
14 , Timeout(..)
19 , Signal(..)
15 , Signal(..)
20 , ContainerDetails(..)
16 , ContainerDetails(..)
21 , DockerClientOpts(..)
17 , DockerClientOpts(..)
@@ -26,30 +22,23 @@ module Docker.Client.Types (
26 , ContainerPortInfo(..)
22 , ContainerPortInfo(..)
27 , Container(..)
23 , Container(..)
28 , ContainerState(..)
24 , ContainerState(..)
29− , State(..)
25+ , Status(..)
31 , Label(..)
27 , Label(..)
33 , Image(..)
29 , Image(..)
35 , dropImagePrefix
30 , dropImagePrefix
36 , CreateOpts(..)
31 , CreateOpts(..)
39 , defaultCreateOpts
32 , defaultCreateOpts
40 , DetachKeys(..)
33 , DetachKeys(..)
41 , StartOpts(..)
34 , StartOpts(..)
42 , defaultStartOpts
35 , defaultStartOpts
43− , ContainerDeleteOpts(..)
36+ , DeleteOpts(..)
44− , defaultContainerDeleteOpts
37+ , defaultDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
47 , Timestamp
38 , Timestamp
48 , TailLogOpt(..)
39 , TailLogOpt(..)
49 , LogOpts(..)
40 , LogOpts(..)
50 , defaultLogOpts
41 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
53 , VolumePermission(..)
42 , VolumePermission(..)
54 , Bind(..)
43 , Bind(..)
55 , Volume(..)
44 , Volume(..)
@@ -75,8 +64,6 @@ module Docker.Client.Types (
75 , UTSMode(..)
64 , UTSMode(..)
76 , HostConfig(..)
65 , HostConfig(..)
77 , defaultHostConfig
66 , defaultHostConfig
78− , NetworkingConfig(..)
80 , Ulimit(..)
67 , Ulimit(..)
81 , ContainerResources(..)
68 , ContainerResources(..)
82 , defaultContainerResources
69 , defaultContainerResources
@@ -106,13 +93,13 @@ import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
106import qualified Data.Aeson as JSON
93import qualified Data.Aeson as JSON
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
94import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
108import Data.Char (isAlphaNum, toUpper)
95import Data.Char (isAlphaNum, toUpper)
96+import Data.Foldable (asum)
109import qualified Data.HashMap.Strict as HM
97import qualified Data.HashMap.Strict as HM
110import Data.Monoid ((<>))
98import Data.Monoid ((<>))
111import Data.Scientific (floatingOrInteger)
99import Data.Scientific (floatingOrInteger)
112import Data.Text (Text)
100import Data.Text (Text)
113import qualified Data.Text as T
101import qualified Data.Text as T
114import Data.Time.Clock (UTCTime)
102import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116import GHC.Generics (Generic)
103import GHC.Generics (Generic)
117import Prelude hiding (all, tail)
104import Prelude hiding (all, tail)
118import Text.Read (readMaybe)
105import Text.Read (readMaybe)
@@ -125,20 +112,14 @@ data Endpoint =
125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
112 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126 | StartContainerEndpoint StartOpts ContainerID
113 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
114 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
115 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
116 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
117 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
118 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
119 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
120 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
121+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
122 | 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
142 deriving (Eq, Show)
123 deriving (Eq, Show)
144-- | We should newtype this
125-- | We should newtype this
@@ -185,20 +166,6 @@ toImageID t =
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
166-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
167data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
188−data StatusCode = StatusCode Int
190−instance ToJSON StatusCode where
191− toJSON (StatusCode c) = object ["StatusCode" .= c]
193−instance FromJSON StatusCode where
194− parseJSON (JSON.Object o) = do
195− c <- o .: "StatusCode"
196− if c >= 0 && c <= 255 then
197− return (StatusCode c)
199− fail "Unknown exit code"
200− parseJSON _ = fail "Unknown exit code"
202-- TODO: Add more Signals or use an existing lib
169-- TODO: Add more Signals or use an existing lib
203-- | Signal used for sending to the process running in the container.
170-- | Signal used for sending to the process running in the container.
204-- The default signal is SIGTERM.
171-- The default signal is SIGTERM.
@@ -213,16 +180,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
181instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
182 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
183+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
184+ parseJSON (JSON.String "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
185 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
186 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
187 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
188+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
190instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
191+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
192+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
193 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
194 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
195 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +217,7 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
217 , processLabel :: Text
251 , resolveConfPath :: FilePath
218 , resolveConfPath :: FilePath
252 , restartCount :: Int
219 , restartCount :: Int
253− , containerDetailsState :: ContainerState
220+ , state :: ContainerState
254 , mounts :: [Mount]
221 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
223 deriving (Eq, Show, Generic)
@@ -258,11 +225,11 @@ data ContainerDetails = ContainerDetails {
258-- | Data type used for parsing the mount information from a container
225-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
227data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
228+ mountName :: Text
262 , mountSource :: FilePath
229 , mountSource :: FilePath
263 , mountDestination :: FilePath
230 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
231+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
232+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266 , mountRW :: Bool
233 , mountRW :: Bool
267 , mountPropogation :: Text
234 , mountPropogation :: Text
@@ -270,14 +237,14 @@ data Mount = Mount {
271instance FromJSON Mount where
238instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
239 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
240+ name <- o .: "Name"
274 src <- o .: "Source"
241 src <- o .: "Source"
275 dest <- o .: "Destination"
242 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
243+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
244+ mode <- o .: "Mode"
278 rw <- o .: "RW"
245 rw <- o .: "RW"
279 prop <- o .: "Propagation"
246 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
247+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
248 parseJSON _ = fail "Mount is not an object"
283-- | Data type used for parsing the container state from a list of
250-- | Data type used for parsing the container state from a list of
@@ -293,7 +260,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
260 , restarting :: Bool
294 , running :: Bool
261 , running :: Bool
295 , startedAt :: UTCTime
262 , startedAt :: UTCTime
296− , state :: State
263+ , status :: Status
298 deriving (Eq, Show, Generic)
265 deriving (Eq, Show, Generic)
@@ -523,8 +490,7 @@ data Container = Container
523 , containerImageId :: ImageID
490 , containerImageId :: ImageID
524 , containerCommand :: Text
491 , containerCommand :: Text
525 , containerCreatedAt :: Int
492 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
493+ , containerStatus :: Status
528 , containerPorts :: [ContainerPortInfo]
494 , containerPorts :: [ContainerPortInfo]
529 , containerLabels :: [Label]
495 , containerLabels :: [Label]
530 , containerNetworks :: [Network]
496 , containerNetworks :: [Network]
@@ -532,14 +498,13 @@ data Container = Container
532 } deriving (Show, Eq)
498 } deriving (Show, Eq)
534instance FromJSON Container where
500instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
501+ parseJSON (JSON.Object v) =
536− Container <$> parseJSON o
502+ Container <$> (v .: "Id")
537 <*> (v .: "Names")
503 <*> (v .: "Names")
538 <*> (v .: "Image")
504 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
505+ <*> (v .: "ImageID")
540− <*> (v .: "Command") -- Doesn't exist anymore
506+ <*> (v .: "Command")
541 <*> (v .: "Created")
507 <*> (v .: "Created")
543 <*> (v .: "Status")
508 <*> (v .: "Status")
544 <*> (v .: "Ports")
509 <*> (v .: "Ports")
545 <*> (v .: "Labels")
510 <*> (v .: "Labels")
@@ -549,20 +514,21 @@ instance FromJSON Container where
549 parseNetworks (JSON.Object v) =
514 parseNetworks (JSON.Object v) =
550 (v .: "Networks") >>= parseJSON
515 (v .: "Networks") >>= parseJSON
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
516 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
518 parseJSON _ = fail "Container: Not a JSON object."
554−-- | Represents the state of the container life cycle.
520+-- | Represents the status of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
521+data Status = Created | Restarting | Running | Paused | Exited | Dead
556 deriving (Eq, Show, Generic)
522 deriving (Eq, Show, Generic)
558−instance FromJSON State where
524+instance FromJSON Status where
559− parseJSON (JSON.String "running") = return Running
525+ parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
526+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561 parseJSON (JSON.String "restarting") = return Restarting
527 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
528+ parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
529+ parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
530+ parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
531+ parseJSON _ = fail "Unknown Status"
567-- | Alias for representing a RepoDigest. We could newtype this and add
533-- | Alias for representing a RepoDigest. We could newtype this and add
568-- some validation.
534-- some validation.
@@ -623,46 +589,20 @@ instance FromJSON Image where
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
589 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624 parseJSON _ = fail "Failed to parse DockerImage."
590 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
650-- | Options used for creating a Container.
593-- | Options used for creating a Container.
651data CreateOpts = CreateOpts {
594data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
595+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
596+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
597 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
599instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
600+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
601 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
602 let hcJSON = toJSON hc
661 case ccJSON of
603 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
604 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
605+ JSON.Object $ HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
666 _ -> error "ContainerConfig is not an object." -- This should never happen.
606 _ -> error "ContainerConfig is not an object." -- This should never happen.
668-- | Container configuration used for creating a container with sensible
608-- | Container configuration used for creating a container with sensible
@@ -684,7 +624,7 @@ defaultContainerConfig imageName = ContainerConfig {
685 , volumes=[]
625 , volumes=[]
686 , workingDir=Nothing
626 , workingDir=Nothing
687− , entrypoint=Entrypoint []
627+ , entrypoint=[]
688 , networkDisabled=Nothing
628 , networkDisabled=Nothing
689 , macAddress=Nothing
629 , macAddress=Nothing
690 , labels=[]
630 , labels=[]
@@ -697,7 +637,7 @@ defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
638 , containerIDFile=Nothing
699 , logConfig=LogDriverConfig JsonFile []
639 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
640+ , networkMode=Bridge
701 , portBindings=[]
641 , portBindings=[]
702 , restartPolicy=RestartOff
642 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
643 , volumeDriver=Nothing
@@ -737,18 +677,14 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
677 , memory=Nothing
738 , memoryReservation=Nothing
678 , memoryReservation=Nothing
739 , memorySwap=Nothing
679 , memorySwap=Nothing
740− , oomKillDisable=Just False
680+ , oomKillDisable=False
741 , ulimits=[]
681 , ulimits=[]
744-- | Default create options when creating a container. You only need to
684-- | Default create options when creating a container. You only need to
745-- specify an image name and the rest is all sensible defaults.
685-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
686defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
687+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
753-- | Override the key sequence for detaching a container.
689-- | Override the key sequence for detaching a container.
754-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
690-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +698,16 @@ defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
698defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764-- | Options for deleting a container.
700-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
701+data DeleteOpts = DeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
702 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
703 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
704 } deriving (Eq, Show)
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)
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
792-- | Default options for deleting a container. Most of the time we DON'T
706-- | Default options for deleting a container. Most of the time we DON'T
793-- want to delete the container's volumes or force delete it if it's
707-- want to delete the container's volumes or force delete it if it's
794-- running.
708-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
709+defaultDeleteOpts :: DeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
710+defaultDeleteOpts = DeleteOpts { 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
805-- | Timestamp alias.
712-- | Timestamp alias.
806type Timestamp = Integer
713type Timestamp = Integer
@@ -828,50 +735,18 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
735 , 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
861-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
738-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862-- | Set permissions on volumes that you mount in the container.
739-- | Set permissions on volumes that you mount in the container.
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
740data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
865instance ToJSON VolumePermission where
742instance ToJSON VolumePermission where
866 toJSON ReadWrite = "rw"
743 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
744+ toJSON ReadOnly = "ro"
869instance FromJSON VolumePermission where
746instance FromJSON VolumePermission where
870 parseJSON "rw" = return ReadWrite
747 parseJSON "rw" = return ReadWrite
871 parseJSON "ro" = return ReadOnly
748 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
749+ parseJSON _ = fail "Failed to parse VolumePermission"
876-- | Used for marking a directory in the container as "exposed" hence
751-- | Used for marking a directory in the container as "exposed" hence
877-- taking it outside of the COW filesystem and making it mountable
752-- taking it outside of the COW filesystem and making it mountable
@@ -893,8 +768,8 @@ instance {-# OVERLAPPING #-} ToJSON [Volume] where
894instance {-# OVERLAPPING #-} FromJSON [Volume] where
769instance {-# OVERLAPPING #-} FromJSON [Volume] where
895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
770 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
771+ parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
772+ parseJSON _ = fail "Volume is not an object"
900data Bind = Bind { hostSrc :: Text
775data Bind = Bind { hostSrc :: Text
@@ -904,10 +779,10 @@ data Bind = Bind { hostSrc :: Text
905instance FromJSON Bind where
780instance FromJSON Bind where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
781 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
782+ [src, dest] -> return $ Bind src dest Nothing
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
783 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
784 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
785+ _ -> fail "Could not parse Bind"
911 parseJSON _ = fail "Bind is not a string"
786 parseJSON _ = fail "Bind is not a string"
913data Device = Device {
788data Device = Device {
@@ -930,15 +805,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
806instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
807 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
808+ [vol] -> return $ VolumeFrom vol Nothing
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
809 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
810 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
811+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
812 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
814instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
815 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
816+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
817 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944instance ToJSON Bind where
819instance ToJSON Bind where
@@ -950,40 +825,40 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
826instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
827 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
828+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
829 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
830+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
831 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
833instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
834 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
835 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
836+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
838-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
839data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
841instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
842 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
843+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
844+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
845+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
846+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
847+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
848+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
849+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
850+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
851+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
853instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
854+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
855+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
856+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
857+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
858+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
859+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
860+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
861+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
862 toJSON LoggingDisabled = JSON.String "none"
989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
864data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
@@ -1017,41 +892,19 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
892 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
894-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
895+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
896 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
898instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
899+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
900+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
901+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
902+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
904instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
905+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
906+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
907 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]
1056data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
909data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1067,7 +920,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
920 parseJSON val = case val of
1068 "tcp" -> return TCP
921 "tcp" -> return TCP
1069 "udp" -> return UDP
922 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
923+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
925-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1197,7 +1050,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
1050 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
1051 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
1052 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1053+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
1054 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
1055 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +1058,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1058 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1059 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1060 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1061+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1063data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1383,7 +1236,7 @@ data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1383data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1236data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1385instance ToJSON MemoryConstraint where
1238instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1239+ toJSON (MemoryConstraint x B) = toJSON x
1387 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1240 toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1388 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1241 toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
@@ -1414,7 +1267,7 @@ data ContainerResources = ContainerResources {
1414 , memoryReservation :: Maybe MemoryConstraint
1267 , memoryReservation :: Maybe MemoryConstraint
1415 , memorySwap :: Maybe MemoryConstraint
1268 , memorySwap :: Maybe MemoryConstraint
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1269 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1270+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1271 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1272 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1273 -- TODO: Missing from 1.24
@@ -1452,7 +1305,7 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1305 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1307instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1308+ toJSON (EnvVar n v) = object [n .= v]
1457-- | ExposedPort represents a port (and it's type)
1310-- | ExposedPort represents a port (and it's type)
1458-- that a container should expose to other containers or the host system.
1311-- that a container should expose to other containers or the host system.
@@ -1492,21 +1345,6 @@ instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1492 where key (ExposedPort p t) = show p <> slash <> show t
1345 where key (ExposedPort p t) = show p <> slash <> show t
1493 slash = T.unpack "/"
1346 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"
1510data ContainerConfig = ContainerConfig {
1348data ContainerConfig = ContainerConfig {
1511 hostname :: Maybe Text
1349 hostname :: Maybe Text
1512 , domainname :: Maybe Text
1350 , domainname :: Maybe Text
@@ -1525,7 +1363,7 @@ data ContainerConfig = ContainerConfig {
1525 , image :: Text
1363 , image :: Text
1526 , volumes :: [Volume]
1364 , volumes :: [Volume]
1527 , workingDir :: Maybe FilePath
1365 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1366+ , entrypoint :: [Text]
1529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1367 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1368 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1369 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1371,6 @@ data ContainerConfig = ContainerConfig {
1533 , stopSignal :: Signal
1371 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1372 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1374instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1375 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1376 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1555,7 +1392,9 @@ instance FromJSON ContainerConfig where
1555 image <- o .: "Image"
1392 image <- o .: "Image"
1556 volumes <- o .: "Volumes"
1393 volumes <- o .: "Volumes"
1557 workingDir <- o .:? "WorkingDir"
1394 workingDir <- o .:? "WorkingDir"
1395+ entrypoint <- asum [ o .:? "Entrypoint" .!= []
1558− entrypoint <- o .: "Entrypoint"
1396+ , (:[]) <$> o .: "Entrypoint"
1559 networkDisabled <- o .:? "networkDisabled"
1398 networkDisabled <- o .:? "networkDisabled"
1560 macAddress <- o .:? "MacAddress"
1399 macAddress <- o .:? "MacAddress"
1561 labels <- o .:? "Labels" .!= []
1400 labels <- o .:? "Labels" .!= []
@@ -1564,11 +1403,7 @@ instance FromJSON ContainerConfig where
1564 macAddress labels stopSignal
1403 macAddress labels stopSignal
1565 parseJSON _ = fail "NetworkSettings is not an object."
1404 parseJSON _ = fail "NetworkSettings is not an object."
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1570parseIntegerText :: (Monad m) => Text -> m Integer
1406parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1407parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1408 Nothing ->
1574 fail "Could not parse Integer"
1409 fail "Could not parse Integer"