@@ -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
@@ -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,
@@ -108,11 +93,9 @@ import 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
110import Data.Monoid ((<>))
95import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
112import Data.Text (Text)
96import Data.Text (Text)
113import qualified Data.Text as T
97import qualified Data.Text as T
114import Data.Time.Clock (UTCTime)
98import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
116import GHC.Generics (Generic)
99import GHC.Generics (Generic)
117import Prelude hiding (all, tail)
100import Prelude hiding (all, tail)
118import Text.Read (readMaybe)
101import Text.Read (readMaybe)
@@ -125,20 +108,14 @@ data Endpoint =
125 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
108 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126 | StartContainerEndpoint StartOpts ContainerID
109 | StartContainerEndpoint StartOpts ContainerID
127 | StopContainerEndpoint Timeout ContainerID
110 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129 | KillContainerEndpoint Signal ContainerID
111 | KillContainerEndpoint Signal ContainerID
130 | RestartContainerEndpoint Timeout ContainerID
112 | RestartContainerEndpoint Timeout ContainerID
131 | PauseContainerEndpoint ContainerID
113 | PauseContainerEndpoint ContainerID
132 | UnpauseContainerEndpoint ContainerID
114 | UnpauseContainerEndpoint ContainerID
133 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
115 | 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.
116 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
117+ | DeleteContainerEndpoint DeleteOpts ContainerID
136 | InspectContainerEndpoint ContainerID
118 | 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)
119 deriving (Eq, Show)
144-- | We should newtype this
121-- | We should newtype this
@@ -185,20 +162,6 @@ toImageID t =
185-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
162-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
163data 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
165-- TODO: Add more Signals or use an existing lib
203-- | Signal used for sending to the process running in the container.
166-- | Signal used for sending to the process running in the container.
204-- The default signal is SIGTERM.
167-- The default signal is SIGTERM.
@@ -213,16 +176,16 @@ data Signal = SIGHUP
214instance FromJSON Signal where
177instance FromJSON Signal where
215 parseJSON (JSON.String "SIGTERM") = return SIGTERM
178 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
179+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
180+ parseJSON (JSON.String "SIGINT") = return SIGINT
218 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
181 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
182 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
183 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
184+ parseJSON _ = fail "Unknown Signal"
223instance ToJSON Signal where
186instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
187+ toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
188+ toJSON SIGINT = "SIGINT"
226 toJSON SIGQUIT = "SIGQUIT"
189 toJSON SIGQUIT = "SIGQUIT"
227 toJSON SIGSTOP = "SIGSTOP"
190 toJSON SIGSTOP = "SIGSTOP"
228 toJSON SIGTERM = "SIGTERM"
191 toJSON SIGTERM = "SIGTERM"
@@ -250,7 +213,7 @@ data ContainerDetails = ContainerDetails {
250 , processLabel :: Text
213 , processLabel :: Text
251 , resolveConfPath :: FilePath
214 , resolveConfPath :: FilePath
252 , restartCount :: Int
215 , restartCount :: Int
253− , containerDetailsState :: ContainerState
216+ , state :: ContainerState
254 , mounts :: [Mount]
217 , mounts :: [Mount]
256 deriving (Eq, Show, Generic)
219 deriving (Eq, Show, Generic)
@@ -258,11 +221,11 @@ data ContainerDetails = ContainerDetails {
258-- | Data type used for parsing the mount information from a container
221-- | Data type used for parsing the mount information from a container
260data Mount = Mount {
223data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
224+ mountName :: Text
262 , mountSource :: FilePath
225 , mountSource :: FilePath
263 , mountDestination :: FilePath
226 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
227+ , mountDriver :: Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
228+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266 , mountRW :: Bool
229 , mountRW :: Bool
267 , mountPropogation :: Text
230 , mountPropogation :: Text
@@ -270,14 +233,14 @@ data Mount = Mount {
271instance FromJSON Mount where
234instance FromJSON Mount where
272 parseJSON (JSON.Object o) = do
235 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
236+ name <- o .: "Name"
274 src <- o .: "Source"
237 src <- o .: "Source"
275 dest <- o .: "Destination"
238 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
239+ driver <- o .: "Driver"
277− -- mode <- o .: "Mode"
240+ mode <- o .: "Mode"
278 rw <- o .: "RW"
241 rw <- o .: "RW"
279 prop <- o .: "Propagation"
242 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
243+ return $ Mount name src dest driver mode rw prop
281 parseJSON _ = fail "Mount is not an object"
244 parseJSON _ = fail "Mount is not an object"
283-- | Data type used for parsing the container state from a list of
246-- | Data type used for parsing the container state from a list of
@@ -293,7 +256,7 @@ data ContainerState = ContainerState {
293 , restarting :: Bool
256 , restarting :: Bool
294 , running :: Bool
257 , running :: Bool
295 , startedAt :: UTCTime
258 , startedAt :: UTCTime
296− , state :: State
259+ , status :: Status
298 deriving (Eq, Show, Generic)
261 deriving (Eq, Show, Generic)
@@ -459,7 +422,7 @@ instance FromJSON NetworkOptions where
459data Network = Network NetworkMode NetworkOptions
422data Network = Network NetworkMode NetworkOptions
460 deriving (Eq, Show)
423 deriving (Eq, Show)
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
425+instance FromJSON [Network] where
463 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
426 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
465 f accM k' v' = do
428 f accM k' v' = do
@@ -523,8 +486,7 @@ data Container = Container
523 , containerImageId :: ImageID
486 , containerImageId :: ImageID
524 , containerCommand :: Text
487 , containerCommand :: Text
525 , containerCreatedAt :: Int
488 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
489+ , containerStatus :: Status
528 , containerPorts :: [ContainerPortInfo]
490 , containerPorts :: [ContainerPortInfo]
529 , containerLabels :: [Label]
491 , containerLabels :: [Label]
530 , containerNetworks :: [Network]
492 , containerNetworks :: [Network]
@@ -532,14 +494,13 @@ data Container = Container
532 } deriving (Show, Eq)
494 } deriving (Show, Eq)
534instance FromJSON Container where
496instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
497+ parseJSON (JSON.Object v) =
536− Container <$> parseJSON o
498+ Container <$> (v .: "Id")
537 <*> (v .: "Names")
499 <*> (v .: "Names")
538 <*> (v .: "Image")
500 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
501+ <*> (v .: "ImageID")
540− <*> (v .: "Command") -- Doesn't exist anymore
502+ <*> (v .: "Command")
541 <*> (v .: "Created")
503 <*> (v .: "Created")
543 <*> (v .: "Status")
504 <*> (v .: "Status")
544 <*> (v .: "Ports")
505 <*> (v .: "Ports")
545 <*> (v .: "Labels")
506 <*> (v .: "Labels")
@@ -549,20 +510,21 @@ instance FromJSON Container where
549 parseNetworks (JSON.Object v) =
510 parseNetworks (JSON.Object v) =
550 (v .: "Networks") >>= parseJSON
511 (v .: "Networks") >>= parseJSON
551 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
512 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
552 parseJSON _ = fail "Container: Not a JSON object."
514 parseJSON _ = fail "Container: Not a JSON object."
554−-- | Represents the state of the container life cycle.
516+-- | Represents the status of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
517+data Status = Created | Restarting | Running | Paused | Exited | Dead
556 deriving (Eq, Show, Generic)
518 deriving (Eq, Show, Generic)
558−instance FromJSON State where
520+instance FromJSON Status where
559− parseJSON (JSON.String "running") = return Running
521+ parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
522+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561 parseJSON (JSON.String "restarting") = return Restarting
523 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
524+ parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
525+ parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
526+ parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
527+ parseJSON _ = fail "Unknown Status"
567-- | Alias for representing a RepoDigest. We could newtype this and add
529-- | Alias for representing a RepoDigest. We could newtype this and add
568-- some validation.
530-- some validation.
@@ -574,13 +536,13 @@ data Label = Label Name Value deriving (Eq, Show)
575-- If there are multiple lables with the same Name in the list
537-- If there are multiple lables with the same Name in the list
576-- then the last one wins.
538-- then the last one wins.
577−instance {-# OVERLAPPING #-} ToJSON [Label] where
539+instance ToJSON [Label] where
578 toJSON [] = emptyJsonObject
540 toJSON [] = emptyJsonObject
579 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
541 toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580 where key (Label k _) = T.unpack k
542 where key (Label k _) = T.unpack k
581 val (Label _ v) = v
543 val (Label _ v) = v
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
545+instance FromJSON [Label] where
584 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
546 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585 where f accM k v = do
547 where f accM k v = do
586 acc <- accM
548 acc <- accM
@@ -597,8 +559,8 @@ data Image = DockerImage {
597 imageId :: ImageID
559 imageId :: ImageID
598 , imageCreated :: Integer
560 , imageCreated :: Integer
599 , imageParentId :: Maybe ImageID
561 , imageParentId :: Maybe ImageID
600− , imageRepoTags :: [Tag]
562+ , imageRepoTags :: Maybe [Tag]
601− , imageRepoDigests :: [Digest]
563+ , imageRepoDigests :: Maybe [Digest]
602 , imageSize :: Integer
564 , imageSize :: Integer
603 , imageVirtualSize :: Integer
565 , imageVirtualSize :: Integer
604 , imageLabels :: [Label]
566 , imageLabels :: [Label]
@@ -615,54 +577,30 @@ instance FromJSON Image where
615 imageId <- o .: "Id"
577 imageId <- o .: "Id"
616 imageCreated <- o .: "Created"
578 imageCreated <- o .: "Created"
617 imageParentId <- o .:? "ParentId"
579 imageParentId <- o .:? "ParentId"
618− imageRepoTags <- o .:? "RepoTags" .!= []
580+ imageRepoTags <- o .:? "RepoTags"
619− imageRepoDigests <- o .:? "RepoDigests" .!= []
581+ imageRepoDigests <- o .:? "RepoDigests"
620 imageSize <- o .: "Size"
582 imageSize <- o .: "Size"
621 imageVirtualSize <- o .: "VirtualSize"
583 imageVirtualSize <- o .: "VirtualSize"
622− imageLabels <- o .:? "Labels" .!= []
584+ imageLabels <- case HM.lookup "Labels" o of
585+ Just ls -> parseJSON ls
586+ Nothing -> return []
623 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
587 return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624 parseJSON _ = fail "Failed to parse DockerImage."
588 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.
591-- | Options used for creating a Container.
651data CreateOpts = CreateOpts {
592data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
593+ containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
594+ , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
655 } deriving (Eq, Show)
595 } deriving (Eq, Show)
657instance ToJSON CreateOpts where
597instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
598+ toJSON (CreateOpts cc hc) = do
659 let ccJSON = toJSON cc
599 let ccJSON = toJSON cc
660 let hcJSON = toJSON hc
600 let hcJSON = toJSON hc
661 case ccJSON of
601 case ccJSON of
662 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
602 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
603+ 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.
604 _ -> error "ContainerConfig is not an object." -- This should never happen.
668-- | Container configuration used for creating a container with sensible
606-- | Container configuration used for creating a container with sensible
@@ -684,7 +622,7 @@ defaultContainerConfig imageName = ContainerConfig {
685 , volumes=[]
623 , volumes=[]
686 , workingDir=Nothing
624 , workingDir=Nothing
687− , entrypoint=Entrypoint []
625+ , entrypoint=Nothing
688 , networkDisabled=Nothing
626 , networkDisabled=Nothing
689 , macAddress=Nothing
627 , macAddress=Nothing
690 , labels=[]
628 , labels=[]
@@ -697,7 +635,7 @@ defaultHostConfig = HostConfig {
698 , containerIDFile=Nothing
636 , containerIDFile=Nothing
699 , logConfig=LogDriverConfig JsonFile []
637 , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
638+ , networkMode=Bridge
701 , portBindings=[]
639 , portBindings=[]
702 , restartPolicy=RestartOff
640 , restartPolicy=RestartOff
703 , volumeDriver=Nothing
641 , volumeDriver=Nothing
@@ -737,18 +675,14 @@ defaultContainerResources = ContainerResources {
737 , memory=Nothing
675 , memory=Nothing
738 , memoryReservation=Nothing
676 , memoryReservation=Nothing
739 , memorySwap=Nothing
677 , memorySwap=Nothing
740− , oomKillDisable=Just False
678+ , oomKillDisable=False
741 , ulimits=[]
679 , ulimits=[]
744-- | Default create options when creating a container. You only need to
682-- | Default create options when creating a container. You only need to
745-- specify an image name and the rest is all sensible defaults.
683-- specify an image name and the rest is all sensible defaults.
746defaultCreateOpts :: T.Text -> CreateOpts
684defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
685+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.
687-- | 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 _.
688-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +696,16 @@ defaultStartOpts :: StartOpts
762defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
696defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
764-- | Options for deleting a container.
698-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
699+data DeleteOpts = DeleteOpts {
766 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
700 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767 , force :: Bool -- ^ If the container is still running force deletion anyway.
701 , force :: Bool -- ^ If the container is still running force deletion anyway.
768 } deriving (Eq, Show)
702 } 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
704-- | 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
705-- want to delete the container's volumes or force delete it if it's
794-- running.
706-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
707+defaultDeleteOpts :: DeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
708+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.
710-- | Timestamp alias.
806type Timestamp = Integer
711type Timestamp = Integer
@@ -828,50 +733,18 @@ defaultLogOpts = LogOpts { stdout = True
828 , tail = All
733 , 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")
736-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862-- | Set permissions on volumes that you mount in the container.
737-- | Set permissions on volumes that you mount in the container.
863data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
738data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
865instance ToJSON VolumePermission where
740instance ToJSON VolumePermission where
866 toJSON ReadWrite = "rw"
741 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
742+ toJSON ReadOnly = "ro"
869instance FromJSON VolumePermission where
744instance FromJSON VolumePermission where
870 parseJSON "rw" = return ReadWrite
745 parseJSON "rw" = return ReadWrite
871 parseJSON "ro" = return ReadOnly
746 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
747+ parseJSON _ = fail "Failed to parse VolumePermission"
876-- | Used for marking a directory in the container as "exposed" hence
749-- | Used for marking a directory in the container as "exposed" hence
877-- taking it outside of the COW filesystem and making it mountable
750-- taking it outside of the COW filesystem and making it mountable
@@ -886,15 +759,15 @@ instance FromJSON VolumePermission where
887newtype Volume = Volume FilePath deriving (Eq, Show)
760newtype Volume = Volume FilePath deriving (Eq, Show)
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
762+instance ToJSON [Volume] where
890 toJSON [] = emptyJsonObject
763 toJSON [] = emptyJsonObject
891 toJSON (v:vs) = toJsonKey (v:vs) getKey
764 toJSON (v:vs) = toJsonKey (v:vs) getKey
892 where getKey (Volume v) = v
765 where getKey (Volume v) = v
894−instance {-# OVERLAPPING #-} FromJSON [Volume] where
767+instance FromJSON [Volume] where
895 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
768 parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
769+ parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
770+ parseJSON _ = fail "Volume is not an object"
900data Bind = Bind { hostSrc :: Text
773data Bind = Bind { hostSrc :: Text
@@ -904,10 +777,10 @@ data Bind = Bind { hostSrc :: Text
905instance FromJSON Bind where
778instance FromJSON Bind where
906 parseJSON (JSON.String t) = case T.split (== ':') t of
779 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
780+ [src, dest] -> return $ Bind src dest Nothing
908 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
781 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
782 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
783+ _ -> fail "Could not parse Bind"
911 parseJSON _ = fail "Bind is not a string"
784 parseJSON _ = fail "Bind is not a string"
913data Device = Device {
786data Device = Device {
@@ -930,15 +803,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
931instance FromJSON VolumeFrom where
804instance FromJSON VolumeFrom where
932 parseJSON (JSON.String t) = case T.split (== ':') t of
805 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
806+ [vol] -> return $ VolumeFrom vol Nothing
934 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
807 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
808 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
809+ _ -> fail "Could not parse VolumeFrom"
937 parseJSON _ = fail "VolumeFrom is not a string"
810 parseJSON _ = fail "VolumeFrom is not a string"
939instance ToJSON VolumeFrom where
812instance ToJSON VolumeFrom where
940 toJSON (VolumeFrom n p) = case p of
813 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
814+ Nothing -> toJSON $ n <> ":" <> "rw"
942 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
815 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
944instance ToJSON Bind where
817instance ToJSON Bind where
@@ -950,51 +823,51 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
951instance FromJSON Link where
824instance FromJSON Link where
952 parseJSON (JSON.String t) = case T.split (== ':') t of
825 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
826+ [f] -> return $ Link f Nothing
954 [f,s] -> return $ Link f $ Just s
827 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
828+ _ -> fail "Could not parse Link"
956 parseJSON _ = fail "Link is not a string"
829 parseJSON _ = fail "Link is not a string"
958instance ToJSON Link where
831instance ToJSON Link where
959 toJSON (Link n1 n2) = toJSON $ case n2 of
832 toJSON (Link n1 n2) = toJSON $ case n2 of
960 Nothing -> T.concat[n1, ":", n1] -- use same name in container
833 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
834+ Just n -> T.concat[n1, ":", n] -- used specified name in container
963-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
836-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
837data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
966instance FromJSON LogDriverType where
839instance FromJSON LogDriverType where
967 parseJSON (JSON.String "json-file") = return JsonFile
840 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
841+ parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
842+ parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
843+ parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
844+ parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
845+ parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
846+ parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
847+ parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
848+ parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
849+ parseJSON _ = fail "Unknown LogDriverType"
978instance ToJSON LogDriverType where
851instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
852+ toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
853+ toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
854+ toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
855+ toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
856+ toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
857+ toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
858+ toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
859+ toJSON Etwlogs = JSON.String "etwlogs"
987 toJSON LoggingDisabled = JSON.String "none"
860 toJSON LoggingDisabled = JSON.String "none"
989data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
862data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
864+instance ToJSON [LogDriverOption] where
992 toJSON [] = emptyJsonObject
865 toJSON [] = emptyJsonObject
993 toJSON (o:os) = toJsonKeyVal (o:os) key val
866 toJSON (o:os) = toJsonKeyVal (o:os) key val
994 where key (LogDriverOption n _) = T.unpack n
867 where key (LogDriverOption n _) = T.unpack n
995 val (LogDriverOption _ v) = v
868 val (LogDriverOption _ v) = v
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
870+instance FromJSON [LogDriverOption] where
998 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
871 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999 where f accM k v = do
872 where f accM k v = do
1000 acc <- accM
873 acc <- accM
@@ -1017,41 +890,19 @@ instance FromJSON LogDriverConfig where
1017 parseJSON _ = fail "LogDriverConfig is not an object"
890 parseJSON _ = fail "LogDriverConfig is not an object"
1019-- TODO: Add container:<name|id> mode
892-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
893+data NetworkMode = Bridge | Host | NetworkDisabled
1021 deriving (Eq, Show, Ord)
894 deriving (Eq, Show, Ord)
1023instance FromJSON NetworkMode where
896instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
897+ parseJSON (JSON.String "bridge") = return Bridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
898+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
899+ parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
900+ parseJSON _ = fail "Unknown NetworkMode"
1030instance ToJSON NetworkMode where
902instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
903+ toJSON Bridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
904+ toJSON Host = JSON.String "host"
1033 toJSON NetworkDisabled = JSON.String "none"
905 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)
907data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
@@ -1067,7 +918,7 @@ instance FromJSON PortType where
1067 parseJSON val = case val of
918 parseJSON val = case val of
1068 "tcp" -> return TCP
919 "tcp" -> return TCP
1069 "udp" -> return UDP
920 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
921+ _ -> fail "PortType: Invalid port type."
1072-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
923-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
@@ -1148,7 +999,7 @@ addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1148 oldeps = exposedPorts cc
999 oldeps = exposedPorts cc
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1002+instance FromJSON [PortBinding] where
1152 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1003 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1154 f accM k v = case T.split (== '/') k of
1005 f accM k v = case T.split (== '/') k of
@@ -1162,7 +1013,7 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1162 parseJSON (JSON.Null) = return []
1013 parseJSON (JSON.Null) = return []
1163 parseJSON _ = fail "PortBindings is not an object"
1014 parseJSON _ = fail "PortBindings is not an object"
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1016+instance ToJSON [PortBinding] where
1166 toJSON [] = emptyJsonObject
1017 toJSON [] = emptyJsonObject
1167 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1018 toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1168 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1019 where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
@@ -1197,7 +1048,7 @@ instance FromJSON RestartPolicy where
1197 "on-failure" -> do
1048 "on-failure" -> do
1198 retry <- o .: "MaximumRetryCount"
1049 retry <- o .: "MaximumRetryCount"
1199 return $ RestartOnFailure retry
1050 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
1051+ "off" -> return RestartOff
1201 _ -> fail "Could not parse RestartPolicy"
1052 _ -> fail "Could not parse RestartPolicy"
1202 parseJSON _ = fail "RestartPolicy is not an object"
1053 parseJSON _ = fail "RestartPolicy is not an object"
@@ -1205,7 +1056,7 @@ instance ToJSON RestartPolicy where
1205 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1056 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
1206 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1057 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
1207 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1058 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1059+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
1210data Isolation = Default | Process | Hyperv deriving (Eq, Show)
1061data Isolation = Default | Process | Hyperv deriving (Eq, Show)
@@ -1378,22 +1229,6 @@ instance ToJSON DeviceRate where
1378 , "Rate" .= r
1229 , "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 {
1232data ContainerResources = ContainerResources {
1398 cpuShares :: Maybe Integer
1233 cpuShares :: Maybe Integer
1399 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
1234 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1244,12 @@ data ContainerResources = ContainerResources {
1409 , cpusetMems :: Maybe Text
1244 , cpusetMems :: Maybe Text
1410 , devices :: [Device]
1245 , devices :: [Device]
1411 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1246 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1247+ , kernelMemory :: Maybe Integer
1413− , memory :: Maybe MemoryConstraint
1248+ , memory :: Maybe Integer
1414− , memoryReservation :: Maybe MemoryConstraint
1249+ , memoryReservation :: Maybe Integer
1415− , memorySwap :: Maybe MemoryConstraint
1250+ , memorySwap :: Maybe Integer
1416 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1251 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1252+ , oomKillDisable :: Bool
1418 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1253 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1419 , ulimits :: [Ulimit]
1254 , ulimits :: [Ulimit]
1420 -- TODO: Missing from 1.24
1255 -- TODO: Missing from 1.24
@@ -1452,7 +1287,7 @@ instance FromJSON EnvVar where
1452 parseJSON _ = fail "EnvVar is not a string"
1287 parseJSON _ = fail "EnvVar is not a string"
1454instance ToJSON EnvVar where
1289instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1290+ toJSON (EnvVar n v) = object [n .= v]
1457-- | ExposedPort represents a port (and it's type)
1292-- | ExposedPort represents a port (and it's type)
1458-- that a container should expose to other containers or the host system.
1293-- that a container should expose to other containers or the host system.
@@ -1473,7 +1308,7 @@ instance ToJSON EnvVar where
1474data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1309data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1311+instance FromJSON [ExposedPort] where
1477 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1312 parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1479 f accM k _ = case T.split (== '/') k of
1314 f accM k _ = case T.split (== '/') k of
@@ -1486,27 +1321,12 @@ instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1486 parseJSON (JSON.Null) = return []
1321 parseJSON (JSON.Null) = return []
1487 parseJSON _ = fail "ExposedPorts is not an object"
1322 parseJSON _ = fail "ExposedPorts is not an object"
1489−instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1324+instance ToJSON [ExposedPort] where
1490 toJSON [] = emptyJsonObject
1325 toJSON [] = emptyJsonObject
1491 toJSON (p:ps) = toJsonKey (p:ps) key
1326 toJSON (p:ps) = toJsonKey (p:ps) key
1492 where key (ExposedPort p t) = show p <> slash <> show t
1327 where key (ExposedPort p t) = show p <> slash <> show t
1493 slash = T.unpack "/"
1328 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 {
1330data ContainerConfig = ContainerConfig {
1511 hostname :: Maybe Text
1331 hostname :: Maybe Text
1512 , domainname :: Maybe Text
1332 , domainname :: Maybe Text
@@ -1525,7 +1345,7 @@ data ContainerConfig = ContainerConfig {
1525 , image :: Text
1345 , image :: Text
1526 , volumes :: [Volume]
1346 , volumes :: [Volume]
1527 , workingDir :: Maybe FilePath
1347 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1348+ , 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?
1349 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
1530 , macAddress :: Maybe Text
1350 , macAddress :: Maybe Text
1531 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1351 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
@@ -1533,7 +1353,6 @@ data ContainerConfig = ContainerConfig {
1533 , stopSignal :: Signal
1353 , stopSignal :: Signal
1534 } deriving (Eq, Show, Generic)
1354 } deriving (Eq, Show, Generic)
1537instance ToJSON ContainerConfig where
1356instance ToJSON ContainerConfig where
1538 toJSON = genericToJSON defaultOptions {
1357 toJSON = genericToJSON defaultOptions {
1539 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
1358 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
@@ -1546,7 +1365,9 @@ instance FromJSON ContainerConfig where
1546 attachStdin <- o .: "AttachStdin"
1365 attachStdin <- o .: "AttachStdin"
1547 attachStdout <- o .: "AttachStdout"
1366 attachStdout <- o .: "AttachStdout"
1548 attachStderr <- o .: "AttachStderr"
1367 attachStderr <- o .: "AttachStderr"
1549− exposedPorts <- o .:? "ExposedPorts" .!= []
1368+ exposedPorts <- case HM.lookup "ExposedPorts" o of
1369+ Just eps -> parseJSON eps
1370+ Nothing -> return []
1550 tty <- o .: "Tty"
1371 tty <- o .: "Tty"
1551 openStdin <- o .: "OpenStdin"
1372 openStdin <- o .: "OpenStdin"
1552 stdinOnce <- o .: "StdinOnce"
1373 stdinOnce <- o .: "StdinOnce"
@@ -1555,20 +1376,18 @@ instance FromJSON ContainerConfig where
1555 image <- o .: "Image"
1376 image <- o .: "Image"
1556 volumes <- o .: "Volumes"
1377 volumes <- o .: "Volumes"
1557 workingDir <- o .:? "WorkingDir"
1378 workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1379+ entrypoint <- o .:? "Entrypoint"
1559 networkDisabled <- o .:? "networkDisabled"
1380 networkDisabled <- o .:? "networkDisabled"
1560 macAddress <- o .:? "MacAddress"
1381 macAddress <- o .:? "MacAddress"
1561− labels <- o .:? "Labels" .!= []
1382+ labels <- case HM.lookup "Labels" o of
1383+ Just ls -> parseJSON ls
1384+ Nothing -> return []
1562 stopSignal <- o .: "StopSignal"
1385 stopSignal <- o .: "StopSignal"
1563 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1386 return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1564 macAddress labels stopSignal
1387 macAddress labels stopSignal
1565 parseJSON _ = fail "NetworkSettings is not an object."
1388 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
1390parseIntegerText :: (Monad m) => Text -> m Integer
1572parseIntegerText t = case readMaybe $ T.unpack t of
1391parseIntegerText t = case readMaybe $ T.unpack t of
1573 Nothing ->
1392 Nothing ->
1574 fail "Could not parse Integer"
1393 fail "Could not parse Integer"
@@ -1590,3 +1409,4 @@ toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1590-- | Helper function that return an empty dictionary "{}"
1409-- | Helper function that return an empty dictionary "{}"
1591emptyJsonObject :: JSON.Value
1410emptyJsonObject :: JSON.Value
1592emptyJsonObject = JSON.Object HM.empty
1411emptyJsonObject = JSON.Object HM.empty