@@ -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(..)
@@ -58,12 +47,12 @@ module Docker.Client.Types (
58 , VolumeFrom(..)
47 , VolumeFrom(..)
59 , Link(..)
48 , Link(..)
60 , LogDriverType(..)
49 , LogDriverType(..)
61− , LogDriverOption(..)
50+ , LogDriverOptions(..)
62 , LogDriverConfig(..)
51 , LogDriverConfig(..)
63 , NetworkMode(..)
52 , NetworkMode(..)
64 , PortType(..)
53 , PortType(..)
65-- , NetworkInterface(..)
54-- , NetworkInterface(..)
66− , Network(..)
55+ , Networks(..)
67 , NetworkSettings(..)
56 , NetworkSettings(..)
68 , NetworkOptions(..)
57 , NetworkOptions(..)
69 , Mount(..)
58 , Mount(..)
@@ -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
@@ -96,8 +83,6 @@ module Docker.Client.Types (
97 , addVolume
84 , addVolume
98 , addVolumeFrom
85 , addVolumeFrom
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
103import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
88import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,12 +92,11 @@ import qualified Data.Aeson as JSON
107import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
92import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
108import Data.Char (isAlphaNum, toUpper)
93import Data.Char (isAlphaNum, toUpper)
109import qualified Data.HashMap.Strict as HM
94import qualified Data.HashMap.Strict as HM
95+import qualified Data.Map as M
110import Data.Monoid ((<>))
96import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
112import Data.Text (Text)
97import Data.Text (Text)
113import qualified Data.Text as T
98import qualified Data.Text as T
114import Data.Time.Clock (UTCTime)
99import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116import GHC.Generics (Generic)
100import GHC.Generics (Generic)
117import Prelude hiding (all, tail)
101import Prelude hiding (all, tail)
118import Text.Read (readMaybe)
102import Text.Read (readMaybe)
@@ -125,20 +109,14 @@ data Endpoint =
125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
109 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126 | StartContainerEndpoint StartOpts ContainerID
110 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
111 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
112 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
113 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
114 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
115 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
116 | 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.
117 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
118+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
119 | 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)
120 deriving (Eq, Show)
144-- | We should newtype this
122-- | We should newtype this
@@ -185,20 +163,6 @@ toImageID t =
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
163-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
164data 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
166-- TODO: Add more Signals or use an existing lib
203-- | Signal used for sending to the process running in the container.
167-- | Signal used for sending to the process running in the container.
204-- The default signal is SIGTERM.
168-- The default signal is SIGTERM.
@@ -213,16 +177,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
178instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
179 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
180+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
181+ parseJSON (JSON.String "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
182 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
183 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
184 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
185+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
187instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
188+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
189+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
190 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
191 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
192 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +214,7 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
214 , processLabel :: Text
251 , resolveConfPath :: FilePath
215 , resolveConfPath :: FilePath
252 , restartCount :: Int
216 , restartCount :: Int
253− , containerDetailsState :: ContainerState
217+ , state :: ContainerState
254 , mounts :: [Mount]
218 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
220 deriving (Eq, Show, Generic)
@@ -258,11 +222,11 @@ data ContainerDetails = ContainerDetails {
258-- | Data type used for parsing the mount information from a container
222-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
224data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
225+ mountName :: Text
262 , mountSource :: FilePath
226 , mountSource :: FilePath
263 , mountDestination :: FilePath
227 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
228+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
229+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266 , mountRW :: Bool
230 , mountRW :: Bool
267 , mountPropogation :: Text
231 , mountPropogation :: Text
@@ -270,14 +234,14 @@ data Mount = Mount {
271instance FromJSON Mount where
235instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
236 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
237+ name <- o .: "Name"
274 src <- o .: "Source"
238 src <- o .: "Source"
275 dest <- o .: "Destination"
239 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
240+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
241+ mode <- o .: "Mode"
278 rw <- o .: "RW"
242 rw <- o .: "RW"
279 prop <- o .: "Propagation"
243 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
244+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
245 parseJSON _ = fail "Mount is not an object"
283-- | Data type used for parsing the container state from a list of
247-- | Data type used for parsing the container state from a list of
@@ -293,7 +257,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
257 , restarting :: Bool
294 , running :: Bool
258 , running :: Bool
295 , startedAt :: UTCTime
259 , startedAt :: UTCTime
296− , state :: State
260+ , status :: Status
298 deriving (Eq, Show, Generic)
262 deriving (Eq, Show, Generic)
@@ -456,17 +420,20 @@ instance FromJSON NetworkOptions where
456 parseJSON _ = fail "NetworkOptions is not an object"
420 parseJSON _ = fail "NetworkOptions is not an object"
458-- TODO: Not sure what this is used for anymore.
422-- TODO: Not sure what this is used for anymore.
459−data Network = Network NetworkMode NetworkOptions
423+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
460 deriving (Eq, Show)
424 deriving (Eq, Show)
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
426+instance FromJSON Networks where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
427+ parseJSON (JSON.Object o) = do
428+ Networks <$> HM.foldlWithKey' f (return M.empty) o
465 f accM k' v' = do
431 f accM k' v' = do
466 acc <- accM
432 acc <- accM
467 k <- parseJSON $ JSON.String k'
433 k <- parseJSON $ JSON.String k'
468 v <- parseJSON v'
434 v <- parseJSON v'
469− return $ (Network k v):acc
435+ return $ M.insert k v acc
470 parseJSON _ = fail "Networks is not an object"
437 parseJSON _ = fail "Networks is not an object"
472-- | Data type reprsenting the various network settings a container can have.
439-- | Data type reprsenting the various network settings a container can have.
@@ -488,7 +455,7 @@ data NetworkSettings = NetworkSettings {
488 , networkSettingsIpPrefixLen :: Int
455 , networkSettingsIpPrefixLen :: Int
489 , networkSettingsIpv6Gateway :: Text
456 , networkSettingsIpv6Gateway :: Text
490 , networkSettingsMacAddress :: Text
457 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
458+ , networkSettingsNetworks :: Networks
493 deriving (Eq, Show)
460 deriving (Eq, Show)
@@ -523,23 +490,21 @@ 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 :: Networks
531 , containerMounts :: [Mount]
497 , containerMounts :: [Mount]
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.
@@ -574,13 +540,13 @@ data Label = Label Name Value deriving (Eq, Show)
575-- If there are multiple lables with the same Name in the list
541-- If there are multiple lables with the same Name in the list
576-- then the last one wins.
542-- then the last one wins.
577−instance {-# OVERLAPPING #-} ToJSON [Label] where
543+instance ToJSON [Label] where
578 toJSON [] = emptyJsonObject
544 toJSON [] = emptyJsonObject
579 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
545 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580 where key (Label k _) = T.unpack k
546 where key (Label k _) = T.unpack k
581 val (Label _ v) = v
547 val (Label _ v) = v
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
549+instance FromJSON [Label] where
584 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
550 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585 where f accM k v = do
551 where f accM k v = do
586 acc <- accM
552 acc <- accM
@@ -597,8 +563,8 @@ data Image = DockerImage {
597 imageId :: ImageID
563 imageId :: ImageID
598 , imageCreated :: Integer
564 , imageCreated :: Integer
599 , imageParentId :: Maybe ImageID
565 , imageParentId :: Maybe ImageID
600− , imageRepoTags :: [Tag]
566+ , imageRepoTags :: Maybe [Tag]
601− , imageRepoDigests :: [Digest]
567+ , imageRepoDigests :: Maybe [Digest]
602 , imageSize :: Integer
568 , imageSize :: Integer
603 , imageVirtualSize :: Integer
569 , imageVirtualSize :: Integer
604 , imageLabels :: [Label]
570 , imageLabels :: [Label]
@@ -615,54 +581,30 @@ instance FromJSON Image where
615 imageId <- o .: "Id"
581 imageId <- o .: "Id"
616 imageCreated <- o .: "Created"
582 imageCreated <- o .: "Created"
617 imageParentId <- o .:? "ParentId"
583 imageParentId <- o .:? "ParentId"
618− imageRepoTags <- o .:? "RepoTags" .!= []
584+ imageRepoTags <- o .:? "RepoTags"
619− imageRepoDigests <- o .:? "RepoDigests" .!= []
585+ imageRepoDigests <- o .:? "RepoDigests"
620 imageSize <- o .: "Size"
586 imageSize <- o .: "Size"
621 imageVirtualSize <- o .: "VirtualSize"
587 imageVirtualSize <- o .: "VirtualSize"
622− imageLabels <- o .:? "Labels" .!= []
588+ imageLabels <- case HM.lookup "Labels" o of
589+ Just ls -> parseJSON ls
590+ Nothing -> return []
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
591 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624 parseJSON _ = fail "Failed to parse DockerImage."
592 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.
595-- | Options used for creating a Container.
651data CreateOpts = CreateOpts {
596data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
597+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
598+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
599 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
601instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
602+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
603 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
604 let hcJSON = toJSON hc
661 case ccJSON of
605 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
606 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
607+ 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.
608 _ -> error "ContainerConfig is not an object." -- This should never happen.
668-- | Container configuration used for creating a container with sensible
610-- | Container configuration used for creating a container with sensible
@@ -684,7 +626,7 @@ defaultContainerConfig imageName = ContainerConfig {
685 , volumes=[]
627 , volumes=[]
686 , workingDir=Nothing
628 , workingDir=Nothing
687− , entrypoint=Entrypoint []
629+ , entrypoint=Nothing
688 , networkDisabled=Nothing
630 , networkDisabled=Nothing
689 , macAddress=Nothing
631 , macAddress=Nothing
690 , labels=[]
632 , labels=[]
@@ -696,8 +638,8 @@ defaultHostConfig :: HostConfig
696defaultHostConfig = HostConfig {
638defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
640 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
641+ , logConfig=LogDriverConfig JsonFile Nothing
700− , networkMode=NetworkBridge
642+ , networkMode=Bridge
701 , portBindings=[]
643 , portBindings=[]
702 , restartPolicy=RestartOff
644 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
645 , volumeDriver=Nothing
@@ -737,18 +679,14 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
679 , memory=Nothing
738 , memoryReservation=Nothing
680 , memoryReservation=Nothing
739 , memorySwap=Nothing
681 , memorySwap=Nothing
740− , oomKillDisable=Just False
682+ , oomKillDisable=False
741 , ulimits=[]
683 , ulimits=[]
744-- | Default create options when creating a container. You only need to
686-- | Default create options when creating a container. You only need to
745-- specify an image name and the rest is all sensible defaults.
687-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
688defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
689+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.
691-- | 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 _.
692-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +700,16 @@ defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
700defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764-- | Options for deleting a container.
702-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
703+data DeleteOpts = DeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
704 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
705 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
706 } 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
708-- | 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
709-- want to delete the container's volumes or force delete it if it's
794-- running.
710-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
711+defaultDeleteOpts :: DeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
712+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.
714-- | Timestamp alias.
806type Timestamp = Integer
715type Timestamp = Integer
@@ -828,50 +737,18 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
737 , 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")
740-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862-- | Set permissions on volumes that you mount in the container.
741-- | Set permissions on volumes that you mount in the container.
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
742data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
865instance ToJSON VolumePermission where
744instance ToJSON VolumePermission where
866 toJSON ReadWrite = "rw"
745 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
746+ toJSON ReadOnly = "ro"
869instance FromJSON VolumePermission where
748instance FromJSON VolumePermission where
870 parseJSON "rw" = return ReadWrite
749 parseJSON "rw" = return ReadWrite
871 parseJSON "ro" = return ReadOnly
750 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
751+ parseJSON _ = fail "Failed to parse VolumePermission"
876-- | Used for marking a directory in the container as "exposed" hence
753-- | Used for marking a directory in the container as "exposed" hence
877-- taking it outside of the COW filesystem and making it mountable
754-- taking it outside of the COW filesystem and making it mountable
@@ -886,15 +763,15 @@ instance FromJSON VolumePermission where
887newtype Volume = Volume FilePath deriving (Eq, Show)
764newtype Volume = Volume FilePath deriving (Eq, Show)
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
766+instance ToJSON [Volume] where
890 toJSON [] = emptyJsonObject
767 toJSON [] = emptyJsonObject
891 toJSON (v:vs) = toJsonKey (v:vs) getKey
768 toJSON (v:vs) = toJsonKey (v:vs) getKey
892 where getKey (Volume v) = v
769 where getKey (Volume v) = v
894−instance {-# OVERLAPPING #-} FromJSON [Volume] where
771+instance FromJSON [Volume] where
895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
772 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
773+ parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
774+ parseJSON _ = fail "Volume is not an object"
900data Bind = Bind { hostSrc :: Text
777data Bind = Bind { hostSrc :: Text
@@ -904,10 +781,10 @@ data Bind = Bind { hostSrc :: Text
905instance FromJSON Bind where
782instance FromJSON Bind where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
783 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
784+ [src, dest] -> return $ Bind src dest Nothing
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
785 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
786 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
787+ _ -> fail "Could not parse Bind"
911 parseJSON _ = fail "Bind is not a string"
788 parseJSON _ = fail "Bind is not a string"
913data Device = Device {
790data Device = Device {
@@ -930,15 +807,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
808instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
809 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
810+ [vol] -> return $ VolumeFrom vol Nothing
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
811 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
812 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
813+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
814 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
816instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
817 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
818+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
819 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944instance ToJSON Bind where
821instance ToJSON Bind where
@@ -950,63 +827,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
828instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
829 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
830+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
831 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
832+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
833 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
835instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
836 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
837 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
838+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
840-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
841data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
843instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
844 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
845+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
846+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
847+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
848+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
849+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
850+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
851+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
852+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
853+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
855instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
856+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
857+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
858+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
859+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
860+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
861+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
862+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
863+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
864 toJSON LoggingDisabled = JSON.String "none"
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
866+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
868+instance FromJSON LogDriverOptions where
992− toJSON [] = emptyJsonObject
869+ parseJSON (JSON.Object o) = do
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
870+ LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
994− where key (LogDriverOption n _) = T.unpack n
995− val (LogDriverOption _ v) = v
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
872+ where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
873+ f accM k (JSON.String v) = do
1000 acc <- accM
874 acc <- accM
1001− value <- parseJSON v
875+ return $ M.insert k v acc
1002− return $ (LogDriverOption k value):acc
876+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
1003− parseJSON JSON.Null = return []
878+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
879+ parseJSON _ = fail "LogDriverOptions is not an object"
881+instance ToJSON LogDriverOptions where
882+ toJSON (LogDriverOptions mp) = toJSON mp
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
884+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1008instance ToJSON LogDriverConfig where
886instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
887 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1012instance FromJSON LogDriverConfig where
889instance FromJSON LogDriverConfig where
@@ -1017,41 +894,19 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
894 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
896-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
897+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
898 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
900instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
901+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
902+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
903+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
904+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
906instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
907+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
908+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
909 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)
911data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1067,7 +922,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
922 parseJSON val = case val of
1068 "tcp" -> return TCP
923 "tcp" -> return TCP
1069 "udp" -> return UDP
924 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
925+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
927-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1148,7 +1003,7 @@ addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1148 oldeps = exposedPorts cc
1003 oldeps = exposedPorts cc
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1006+instance FromJSON [PortBinding] where
1152 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1007 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1154 f accM k v = case T.split (== '/') k of
1009 f accM k v = case T.split (== '/') k of
@@ -1162,7 +1017,7 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1162 parseJSON (JSON.Null) = return []
1017 parseJSON (JSON.Null) = return []
1163 parseJSON _ = fail "PortBindings is not an object"
1018 parseJSON _ = fail "PortBindings is not an object"
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1020+instance ToJSON [PortBinding] where
1166 toJSON [] = emptyJsonObject
1021 toJSON [] = emptyJsonObject
1167 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1022 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1168 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1023 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
@@ -1197,7 +1052,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
1052 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
1053 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
1054 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1055+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
1056 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
1057 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +1060,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1060 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1061 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1062 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1063+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1065data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1378,22 +1233,6 @@ instance ToJSON DeviceRate where
1378 , "Rate" .= r
1233 , "Rate" .= r
1381−data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1383−data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1385−instance ToJSON MemoryConstraint where
1386− toJSON (MemoryConstraint x B) = toJSON x
1387− toJSON (MemoryConstraint x MB) = toJSON $ x * 1024 * 1024
1388− toJSON (MemoryConstraint x GB) = toJSON $ x * 1024 * 1024 * 1024
1390−instance FromJSON MemoryConstraint where
1391− parseJSON (JSON.Number x) = case (floatingOrInteger x) of
1392− Left (_ :: Double) -> fail "Failed to parse MemoryConstraint"
1393− Right i -> return $ MemoryConstraint i B
1394− -- The docker daemon will always return the number as bytes (integer), regardless of how we set them (using MB or GB)
1395− parseJSON _ = fail "Failed to parse MemoryConstraint"
1397data ContainerResources = ContainerResources {
1236data ContainerResources = ContainerResources {
1398 cpuShares :: Maybe Integer
1237 cpuShares :: Maybe Integer
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1238 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1248,12 @@ data ContainerResources = ContainerResources {
1409 , cpusetMems :: Maybe Text
1248 , cpusetMems :: Maybe Text
1410 , devices :: [Device]
1249 , devices :: [Device]
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1250 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1251+ , kernelMemory :: Maybe Integer
1413− , memory :: Maybe MemoryConstraint
1252+ , memory :: Maybe Integer
1414− , memoryReservation :: Maybe MemoryConstraint
1253+ , memoryReservation :: Maybe Integer
1415− , memorySwap :: Maybe MemoryConstraint
1254+ , memorySwap :: Maybe Integer
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1255 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1256+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1257 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1258 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1259 -- TODO: Missing from 1.24
@@ -1452,7 +1291,7 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1291 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1293instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1294+ toJSON (EnvVar n v) = object [n .= v]
1457-- | ExposedPort represents a port (and it's type)
1296-- | ExposedPort represents a port (and it's type)
1458-- that a container should expose to other containers or the host system.
1297-- that a container should expose to other containers or the host system.
@@ -1473,7 +1312,7 @@ instance ToJSON EnvVar where
1474data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1313data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1315+instance FromJSON [ExposedPort] where
1477 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1316 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1479 f accM k _ = case T.split (== '/') k of
1318 f accM k _ = case T.split (== '/') k of
@@ -1486,27 +1325,12 @@ instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1486 parseJSON (JSON.Null) = return []
1325 parseJSON (JSON.Null) = return []
1487 parseJSON _ = fail "ExposedPorts is not an object"
1326 parseJSON _ = fail "ExposedPorts is not an object"
1489−instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1328+instance ToJSON [ExposedPort] where
1490 toJSON [] = emptyJsonObject
1329 toJSON [] = emptyJsonObject
1491 toJSON (p:ps) = toJsonKey (p:ps) key
1330 toJSON (p:ps) = toJsonKey (p:ps) key
1492 where key (ExposedPort p t) = show p <> slash <> show t
1331 where key (ExposedPort p t) = show p <> slash <> show t
1493 slash = T.unpack "/"
1332 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 {
1334data ContainerConfig = ContainerConfig {
1511 hostname :: Maybe Text
1335 hostname :: Maybe Text
1512 , domainname :: Maybe Text
1336 , domainname :: Maybe Text
@@ -1525,7 +1349,7 @@ data ContainerConfig = ContainerConfig {
1525 , image :: Text
1349 , image :: Text
1526 , volumes :: [Volume]
1350 , volumes :: [Volume]
1527 , workingDir :: Maybe FilePath
1351 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1352+ , entrypoint :: Maybe Text -- Can be null?
1529 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1353 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1354 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1355 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1357,6 @@ data ContainerConfig = ContainerConfig {
1533 , stopSignal :: Signal
1357 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1358 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1360instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1361 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1362 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1546,7 +1369,9 @@ instance FromJSON ContainerConfig where
1546 attachStdin <- o .: "AttachStdin"
1369 attachStdin <- o .: "AttachStdin"
1547 attachStdout <- o .: "AttachStdout"
1370 attachStdout <- o .: "AttachStdout"
1548 attachStderr <- o .: "AttachStderr"
1371 attachStderr <- o .: "AttachStderr"
1549− exposedPorts <- o .:? "ExposedPorts" .!= []
1372+ exposedPorts <- case HM.lookup "ExposedPorts" o of
1373+ Just eps -> parseJSON eps
1374+ Nothing -> return []
1550 tty <- o .: "Tty"
1375 tty <- o .: "Tty"
1551 openStdin <- o .: "OpenStdin"
1376 openStdin <- o .: "OpenStdin"
1552 stdinOnce <- o .: "StdinOnce"
1377 stdinOnce <- o .: "StdinOnce"
@@ -1555,20 +1380,18 @@ instance FromJSON ContainerConfig where
1555 image <- o .: "Image"
1380 image <- o .: "Image"
1556 volumes <- o .: "Volumes"
1381 volumes <- o .: "Volumes"
1557 workingDir <- o .:? "WorkingDir"
1382 workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1383+ entrypoint <- o .:? "Entrypoint"
1559 networkDisabled <- o .:? "networkDisabled"
1384 networkDisabled <- o .:? "networkDisabled"
1560 macAddress <- o .:? "MacAddress"
1385 macAddress <- o .:? "MacAddress"
1561− labels <- o .:? "Labels" .!= []
1386+ labels <- case HM.lookup "Labels" o of
1387+ Just ls -> parseJSON ls
1388+ Nothing -> return []
1562 stopSignal <- o .: "StopSignal"
1389 stopSignal <- o .: "StopSignal"
1563 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1390 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1564 macAddress labels stopSignal
1391 macAddress labels stopSignal
1565 parseJSON _ = fail "NetworkSettings is not an object."
1392 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
1394parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1395parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1396 Nothing ->
1574 fail "Could not parse Integer"
1397 fail "Could not parse Integer"
@@ -1590,3 +1413,4 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1590-- | Helper function that return an empty dictionary "{}"
1413-- | Helper function that return an empty dictionary "{}"
1591emptyJsonObject :: JSON.Value
1414emptyJsonObject :: JSON.Value
1592emptyJsonObject = JSON.Object HM.empty
1415emptyJsonObject = JSON.Object HM.empty