@@ -11,11 +11,7 @@ module Docker.Client.Types (
1111 , ImageID
1212 , fromImageID
1313 , toImageID
14− , NetworkID
15− , fromNetworkID
16− , toNetworkID
1714 , Timeout(..)
18− , StatusCode(..)
1915 , Signal(..)
2016 , ContainerDetails(..)
2117 , DockerClientOpts(..)
@@ -26,48 +22,42 @@ module Docker.Client.Types (
2622 , ContainerPortInfo(..)
2723 , Container(..)
2824 , ContainerState(..)
29− , State(..)
25+ , Status(..)
3026 , Digest
31− , Label(..)
27+ , Labels(..)
3228 , Tag
3329 , Image(..)
34− , Entrypoint(..)
3530 , dropImagePrefix
3631 , CreateOpts(..)
37− , BuildOpts(..)
38− , defaultBuildOpts
3932 , defaultCreateOpts
4033 , DetachKeys(..)
4134 , StartOpts(..)
4235 , defaultStartOpts
43− , ContainerDeleteOpts(..)
44− , defaultContainerDeleteOpts
45− , ImageDeleteOpts(..)
46− , defaultImageDeleteOpts
36+ , DeleteOpts(..)
37+ , defaultDeleteOpts
4738 , Timestamp
4839 , TailLogOpt(..)
4940 , LogOpts(..)
5041 , defaultLogOpts
51− , CreateNetworkOpts(..)
52− , defaultCreateNetworkOpts
5342 , VolumePermission(..)
5443 , Bind(..)
55− , Volume(..)
44+ , Volumes(..)
5645 , Device(..)
5746 , ContainerName
5847 , VolumeFrom(..)
5948 , Link(..)
6049 , LogDriverType(..)
61− , LogDriverOption(..)
50+ , LogDriverOptions(..)
6251 , LogDriverConfig(..)
6352 , NetworkMode(..)
6453 , PortType(..)
6554-- , NetworkInterface(..)
66− , Network(..)
55+ , Networks(..)
6756 , NetworkSettings(..)
6857 , NetworkOptions(..)
6958 , Mount(..)
7059 , PortBinding(..)
60+ , PortBindings(..)
7161 , HostPort(..)
7262 , RetryCount
7363 , RestartPolicy(..)
@@ -75,8 +65,6 @@ module Docker.Client.Types (
7565 , UTSMode(..)
7666 , HostConfig(..)
7767 , defaultHostConfig
78− , NetworkingConfig(..)
79− , EndpointConfig(..)
8068 , Ulimit(..)
8169 , ContainerResources(..)
8270 , defaultContainerResources
@@ -86,18 +74,11 @@ module Docker.Client.Types (
8674 , EnvVar(..)
8775 , ContainerConfig(..)
8876 , defaultContainerConfig
89− , ExposedPort(..)
77+ , ExposedPorts(..)
9078 , DeviceWeight(..)
9179 , DeviceRate(..)
9280 , addPortBinding
93− , addExposedPort
94− , addBind
95− , setCmd
96− , addLink
97− , addVolume
98− , addVolumeFrom
99− , MemoryConstraint(..)
100− , MemoryConstraintSize(..)
81+ , addBinds
10182 ) where
10283
10384import Data.Aeson (FromJSON, ToJSON, genericParseJSON,
@@ -107,12 +88,11 @@ import qualified Data.Aeson as JSON
10788import Data.Aeson.Types (defaultOptions, fieldLabelModifier)
10889import Data.Char (isAlphaNum, toUpper)
10990import qualified Data.HashMap.Strict as HM
91+import qualified Data.Map as M
11092import Data.Monoid ((<>))
111−import Data.Scientific (floatingOrInteger)
11293import Data.Text (Text)
11394import qualified Data.Text as T
11495import Data.Time.Clock (UTCTime)
115−import qualified Data.Vector as V
11696import GHC.Generics (Generic)
11797import Prelude hiding (all, tail)
11898import Text.Read (readMaybe)
@@ -125,20 +105,14 @@ data Endpoint =
125105 | CreateContainerEndpoint CreateOpts (Maybe ContainerName)
126106 | StartContainerEndpoint StartOpts ContainerID
127107 | StopContainerEndpoint Timeout ContainerID
128− | WaitContainerEndpoint ContainerID
129108 | KillContainerEndpoint Signal ContainerID
130109 | RestartContainerEndpoint Timeout ContainerID
131110 | PauseContainerEndpoint ContainerID
132111 | UnpauseContainerEndpoint ContainerID
133112 | ContainerLogsEndpoint LogOpts Bool ContainerID -- ^ Second argument (Bool) is whether to follow which is currently hardcoded to False.
134113 -- See note in 'Docker.Client.Api.getContainerLogs' for explanation why.
135− | DeleteContainerEndpoint ContainerDeleteOpts ContainerID
114+ | DeleteContainerEndpoint DeleteOpts ContainerID
136115 | 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
142116 deriving (Eq, Show)
143117
144118-- | We should newtype this
@@ -185,20 +159,6 @@ toImageID t =
185159-- | Timeout used for stopping a container. DefaultTimeout is 10 seconds.
186160data Timeout = Timeout Integer | DefaultTimeout deriving (Eq, Show)
187161
188−data StatusCode = StatusCode Int
189−
190−instance ToJSON StatusCode where
191− toJSON (StatusCode c) = object ["StatusCode" .= c]
192−
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)
198− else
199− fail "Unknown exit code"
200− parseJSON _ = fail "Unknown exit code"
201−
202162-- TODO: Add more Signals or use an existing lib
203163-- | Signal used for sending to the process running in the container.
204164-- The default signal is SIGTERM.
@@ -213,16 +173,16 @@ data Signal = SIGHUP
213173
214174instance FromJSON Signal where
215175 parseJSON (JSON.String "SIGTERM") = return SIGTERM
216− parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
217− parseJSON (JSON.String "SIGINT") = return SIGINT
176+ parseJSON (JSON.String "SIGHUP") = return SIGHUP -- Note: Guessing on the string values for these.
177+ parseJSON (JSON.String "SIGINT") = return SIGINT
218178 parseJSON (JSON.String "SIGQUIT") = return SIGQUIT
219179 parseJSON (JSON.String "SIGSTOP") = return SIGSTOP
220180 parseJSON (JSON.String "SIGUSR1") = return SIGUSR1
221− parseJSON _ = fail "Unknown Signal"
181+ parseJSON _ = fail "Unknown Signal"
222182
223183instance ToJSON Signal where
224− toJSON SIGHUP = "SIGHUP"
225− toJSON SIGINT = "SIGINT"
184+ toJSON SIGHUP = "SIGHUP"
185+ toJSON SIGINT = "SIGINT"
226186 toJSON SIGQUIT = "SIGQUIT"
227187 toJSON SIGSTOP = "SIGSTOP"
228188 toJSON SIGTERM = "SIGTERM"
@@ -244,13 +204,13 @@ data ContainerDetails = ContainerDetails {
244204 , containerDetailsId :: ContainerID
245205 , containerDetailsImage :: ImageID
246206 , mountLabel :: Text
247− , name :: Text
207+ , names :: [Text]
248208 , networkSettings :: NetworkSettings
249209 , path :: FilePath
250210 , processLabel :: Text
251211 , resolveConfPath :: FilePath
252212 , restartCount :: Int
253− , containerDetailsState :: ContainerState
213+ , state :: ContainerState
254214 , mounts :: [Mount]
255215 }
256216 deriving (Eq, Show, Generic)
@@ -258,11 +218,11 @@ data ContainerDetails = ContainerDetails {
258218-- | Data type used for parsing the mount information from a container
259219-- list.
260220data Mount = Mount {
261− mountName :: Maybe Text -- this is optional
221+ mountName :: Text
262222 , mountSource :: FilePath
263223 , mountDestination :: FilePath
264− , mountDriver :: Maybe Text
265− -- , mountMode :: Maybe VolumePermission -- apparently this can be null
224+ , mountDriver :: Text
225+ , mountMode :: Maybe VolumePermission -- apparently this can be null
266226 , mountRW :: Bool
267227 , mountPropogation :: Text
268228 }
@@ -270,14 +230,14 @@ data Mount = Mount {
270230
271231instance FromJSON Mount where
272232 parseJSON (JSON.Object o) = do
273− name <- o .:? "Name"
233+ name <- o .: "Name"
274234 src <- o .: "Source"
275235 dest <- o .: "Destination"
276− driver <- o .:? "Driver"
277− -- mode <- o .: "Mode"
236+ driver <- o .: "Driver"
237+ mode <- o .: "Mode"
278238 rw <- o .: "RW"
279239 prop <- o .: "Propagation"
280− return $ Mount name src dest driver rw prop
240+ return $ Mount name src dest driver mode rw prop
281241 parseJSON _ = fail "Mount is not an object"
282242
283243-- | Data type used for parsing the container state from a list of
@@ -293,7 +253,7 @@ data ContainerState = ContainerState {
293253 , restarting :: Bool
294254 , running :: Bool
295255 , startedAt :: UTCTime
296− , state :: State
256+ , status :: Status
297257 }
298258 deriving (Eq, Show, Generic)
299259
@@ -371,7 +331,7 @@ instance FromJSON ContainerDetails where
371331 id <- parseJSON v
372332 image <- o .: "Image"
373333 mountLabel <- o .: "MountLabel"
374− name <- o .: "Name"
334+ names <- o .: "Names"
375335 networkSettings <- o .: "NetworkSettings"
376336 path <- o .: "Path"
377337 processLabel <- o .: "ProcessLabel"
@@ -379,7 +339,7 @@ instance FromJSON ContainerDetails where
379339 restartCount <- o .: "RestartCount"
380340 state <- o .: "State"
381341 mounts <- o .: "Mounts"
382− return $ ContainerDetails appArmor args config created driver hostConfig hostnamePath hostsPath logPath id image mountLabel name networkSettings path processLabel resolveConfPath restartCount state mounts
342+ return $ ContainerDetails appArmor args config created driver hostConfig hostnamePath hostsPath logPath id image mountLabel names networkSettings path processLabel resolveConfPath restartCount state mounts
383343 parseJSON _ = fail "ContainerDetails is not an object"
384344
385345instance ToJSON ContainerID where
@@ -456,17 +416,20 @@ instance FromJSON NetworkOptions where
456416 parseJSON _ = fail "NetworkOptions is not an object"
457417
458418-- TODO: Not sure what this is used for anymore.
459−data Network = Network NetworkMode NetworkOptions
419+newtype Networks = Networks (M.Map NetworkMode NetworkOptions) -- Note: Is it ever possible that there will be duplicates of network modes?
460420 deriving (Eq, Show)
461421
462−instance {-# OVERLAPPING #-} FromJSON [Network] where
463− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
422+instance FromJSON Networks where
423+ parseJSON (JSON.Object o) = do
424+ Networks <$> HM.foldlWithKey' f (return M.empty) o
425+
464426 where
465427 f accM k' v' = do
466428 acc <- accM
467429 k <- parseJSON $ JSON.String k'
468430 v <- parseJSON v'
469− return $ (Network k v):acc
431+ return $ M.insert k v acc
432+
470433 parseJSON _ = fail "Networks is not an object"
471434
472435-- | Data type reprsenting the various network settings a container can have.
@@ -476,7 +439,7 @@ data NetworkSettings = NetworkSettings {
476439 , networkSettingsHairpinMode :: Bool
477440 , networkSettingsLinkLocalIPv6Address :: Text
478441 , networkSettingsLinkLocalIPv6PrefixLen :: Int
479− , networkSettingsPorts :: [PortBinding]
442+ , networkSettingsPorts :: PortBindings
480443 , networkSettingsSandboxKey :: Text
481444 , networkSettingsSecondaryIPAddresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
482445 , networkSettingsSecondaryIPv6Addresses :: Maybe [Text] -- TODO: 1.24 spec is unclear
@@ -488,7 +451,7 @@ data NetworkSettings = NetworkSettings {
488451 , networkSettingsIpPrefixLen :: Int
489452 , networkSettingsIpv6Gateway :: Text
490453 , networkSettingsMacAddress :: Text
491− , networkSettingsNetworks :: [Network]
454+ , networkSettingsNetworks :: Networks
492455 }
493456 deriving (Eq, Show)
494457
@@ -523,23 +486,21 @@ data Container = Container
523486 , containerImageId :: ImageID
524487 , containerCommand :: Text
525488 , containerCreatedAt :: Int
526− , containerState :: State
527− , containerStatus :: Maybe Text
489+ , containerStatus :: Status
528490 , containerPorts :: [ContainerPortInfo]
529− , containerLabels :: [Label]
530− , containerNetworks :: [Network]
491+ , containerLabels :: Labels
492+ , containerNetworks :: Networks
531493 , containerMounts :: [Mount]
532494 } deriving (Show, Eq)
533495
534496instance FromJSON Container where
535− parseJSON o@(JSON.Object v) =
536− Container <$> parseJSON o
497+ parseJSON (JSON.Object v) =
498+ Container <$> (v .: "Id")
537499 <*> (v .: "Names")
538500 <*> (v .: "Image")
539− <*> (v .: "ImageID") -- Doesn't exist anymore
540− <*> (v .: "Command") -- Doesn't exist anymore
501+ <*> (v .: "ImageID")
502+ <*> (v .: "Command")
541503 <*> (v .: "Created")
542− <*> (v .: "State")
543504 <*> (v .: "Status")
544505 <*> (v .: "Ports")
545506 <*> (v .: "Labels")
@@ -549,45 +510,34 @@ instance FromJSON Container where
549510 parseNetworks (JSON.Object v) =
550511 (v .: "Networks") >>= parseJSON
551512 parseNetworks _ = fail "Container NetworkSettings: Not a JSON object."
513+
552514 parseJSON _ = fail "Container: Not a JSON object."
553515
554−-- | Represents the state of the container life cycle.
555−data State = Created | Restarting | Running | Paused | Exited | Dead
516+-- | Represents the status of the container life cycle.
517+data Status = Created | Restarting | Running | Paused | Exited | Dead
556518 deriving (Eq, Show, Generic)
557519
558−instance FromJSON State where
559− parseJSON (JSON.String "running") = return Running
560− parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
520+instance FromJSON Status where
521+ parseJSON (JSON.String "running") = return Running
522+ parseJSON (JSON.String "created") = return Created -- Note: Guessing on the string values of these.
561523 parseJSON (JSON.String "restarting") = return Restarting
562− parseJSON (JSON.String "paused") = return Paused
563− parseJSON (JSON.String "exited") = return Exited
564− parseJSON (JSON.String "dead") = return Dead
565− parseJSON s = fail $ "Unknown Status: " ++ show s
524+ parseJSON (JSON.String "paused") = return Paused
525+ parseJSON (JSON.String "exited") = return Exited
526+ parseJSON (JSON.String "dead") = return Dead
527+ parseJSON _ = fail "Unknown Status"
566528
567529-- | Alias for representing a RepoDigest. We could newtype this and add
568530-- some validation.
569531type Digest = Text
570532
571533-- | Container and Image Labels.
572−data Label = Label Name Value deriving (Eq, Show)
573−
534+newtype Labels = Labels (M.Map Name Value) deriving (Eq, Show)
574535
575−-- If there are multiple lables with the same Name in the list
576−-- then the last one wins.
577−instance {-# OVERLAPPING #-} ToJSON [Label] where
578− toJSON [] = emptyJsonObject
579− toJSON (l:ls) = toJsonKeyVal (l:ls) key val
580− where key (Label k _) = T.unpack k
581− val (Label _ v) = v
536+instance FromJSON Labels where
537+ parseJSON val = Labels <$> parseJSON val
582538
583−instance {-# OVERLAPPING #-} FromJSON [Label] where
584− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
585− where f accM k v = do
586− acc <- accM
587− value <- parseJSON v
588− return $ (Label k value):acc
589− parseJSON JSON.Null = return []
590− parseJSON _ = fail "Failed to parse Labels. Not an object."
539+instance ToJSON Labels where
540+ toJSON (Labels kvs) = object [k .= v | (k,v) <- (M.toList kvs)]
591541
592542-- | Alias for Tags.
593543type Tag = Text
@@ -598,10 +548,10 @@ data Image = DockerImage {
598548 , imageCreated :: Integer
599549 , imageParentId :: Maybe ImageID
600550 , imageRepoTags :: [Tag]
601− , imageRepoDigests :: [Digest]
551+ , imageRepoDigests :: Maybe [Digest]
602552 , imageSize :: Integer
603553 , imageVirtualSize :: Integer
604− , imageLabels :: [Label]
554+ , imageLabels :: Maybe Labels
605555 } deriving (Show, Eq, Generic)
606556
607557-- | Helper function used for dropping the "image" prefix when serializing
@@ -609,60 +559,23 @@ data Image = DockerImage {
609559dropImagePrefix :: [a] -> [a]
610560dropImagePrefix = drop 5
611561
612−
613562instance FromJSON Image where
614− parseJSON (JSON.Object o) = do
615− imageId <- o .: "Id"
616− imageCreated <- o .: "Created"
617− imageParentId <- o .:? "ParentId"
618− imageRepoTags <- o .:? "RepoTags" .!= []
619− imageRepoDigests <- o .:? "RepoDigests" .!= []
620− imageSize <- o .: "Size"
621− imageVirtualSize <- o .: "VirtualSize"
622− imageLabels <- o .:? "Labels" .!= []
623− return $ DockerImage imageId imageCreated imageParentId imageRepoTags imageRepoDigests imageSize imageVirtualSize imageLabels
624− parseJSON _ = fail "Failed to parse DockerImage."
625−
626−-- | Alias for Aliases.
627−type Alias = Text
628−
629−-- | EndpointsConfig is container configuration for a specific network
630−newtype EndpointConfig = EndpointConfig [Alias] deriving (Eq, Show)
631−
632−instance ToJSON EndpointConfig where
633− toJSON (EndpointConfig aliases) = JSON.object
634− [ "Aliases" .= aliases
635− ]
636−
637−-- | Alias for endpoint name
638−type EndpointName = Text
639−
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)
644−
645−instance ToJSON NetworkingConfig where
646− toJSON (NetworkingConfig endpointsConfig) = JSON.object
647− [ "EndpointsConfig" .= endpointsConfig
648− ]
563+ parseJSON = genericParseJSON defaultOptions {
564+ fieldLabelModifier = dropImagePrefix}
649565
650566-- | Options used for creating a Container.
651567data CreateOpts = CreateOpts {
652− containerConfig :: ContainerConfig
653− , hostConfig :: HostConfig
654− , networkingConfig :: NetworkingConfig
568+ containerConfig :: ContainerConfig
569+ , hostConfig :: HostConfig
655570 } deriving (Eq, Show)
656571
657572instance ToJSON CreateOpts where
658− toJSON (CreateOpts cc hc nc) = do
573+ toJSON (CreateOpts cc hc) = do
659574 let ccJSON = toJSON cc
660575 let hcJSON = toJSON hc
661576 case ccJSON of
662577 JSON.Object (o :: HM.HashMap T.Text JSON.Value) -> do
663− let o1 = HM.insert "HostConfig" hcJSON o
664− let o2 = HM.insert "NetworkingConfig" (toJSON nc) o1
665− JSON.Object o2
578+ JSON.Object $ HM.insert "HostConfig" hcJSON o
666579 _ -> error "ContainerConfig is not an object." -- This should never happen.
667580
668581-- | Container configuration used for creating a container with sensible
@@ -676,18 +589,18 @@ defaultContainerConfig imageName = ContainerConfig {
676589 , attachStdout=False
677590 , image=imageName
678591 , attachStderr=False
679− , exposedPorts=[]
592+ , exposedPorts=Nothing -- ExposedPorts M.empty
680593 , tty=False
681594 , openStdin=False
682595 , stdinOnce=False
683596 , env=[]
684597 , cmd=[]
685− , volumes=[]
598+ , volumes=Nothing
686599 , workingDir=Nothing
687− , entrypoint=Entrypoint []
600+ , entrypoint=Nothing
688601 , networkDisabled=Nothing
689602 , macAddress=Nothing
690− , labels=[]
603+ , labels=Nothing
691604 , stopSignal=SIGTERM
692605 }
693606
@@ -696,9 +609,9 @@ defaultHostConfig :: HostConfig
696609defaultHostConfig = HostConfig {
697610 binds=[]
698611 , containerIDFile=Nothing
699− , logConfig=LogDriverConfig JsonFile []
700− , networkMode=NetworkBridge
701− , portBindings=[]
612+ , logConfig=LogDriverConfig JsonFile Nothing
613+ , networkMode=Bridge
614+ , portBindings=PortBindings []
702615 , restartPolicy=RestartOff
703616 , volumeDriver=Nothing
704617 , volumesFrom=[]
@@ -737,18 +650,14 @@ defaultContainerResources = ContainerResources {
737650 , memory=Nothing
738651 , memoryReservation=Nothing
739652 , memorySwap=Nothing
740− , oomKillDisable=Just False
653+ , oomKillDisable=False
741654 , ulimits=[]
742655 }
743656
744657-- | Default create options when creating a container. You only need to
745658-- specify an image name and the rest is all sensible defaults.
746659defaultCreateOpts :: T.Text -> CreateOpts
747−defaultCreateOpts imageName = CreateOpts
748− { containerConfig = defaultContainerConfig imageName
749− , hostConfig = defaultHostConfig
750− , networkingConfig = NetworkingConfig HM.empty
751− }
660+defaultCreateOpts imageName = CreateOpts { containerConfig = defaultContainerConfig imageName, hostConfig = defaultHostConfig }
752661
753662-- | Override the key sequence for detaching a container.
754663-- Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _.
@@ -762,45 +671,16 @@ defaultStartOpts :: StartOpts
762671defaultStartOpts = StartOpts { detachKeys = DefaultDetachKey }
763672
764673-- | Options for deleting a container.
765−data ContainerDeleteOpts = ContainerDeleteOpts {
674+data DeleteOpts = DeleteOpts {
766675 deleteVolumes :: Bool -- ^ Automatically cleanup volumes that the container created as well.
767676 , force :: Bool -- ^ If the container is still running force deletion anyway.
768677 } deriving (Eq, Show)
769678
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)
781−
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
790− }
791−
792679-- | Default options for deleting a container. Most of the time we DON'T
793680-- want to delete the container's volumes or force delete it if it's
794681-- running.
795−defaultContainerDeleteOpts :: ContainerDeleteOpts
796−defaultContainerDeleteOpts = ContainerDeleteOpts { deleteVolumes = False, force = False }
797−
798−-- | Image delete opts
799−data ImageDeleteOpts = ImageDeleteOpts deriving (Eq, Show)
800−
801−-- | Sane image deletion defaults
802−defaultImageDeleteOpts :: ImageDeleteOpts
803−defaultImageDeleteOpts = ImageDeleteOpts
682+defaultDeleteOpts :: DeleteOpts
683+defaultDeleteOpts = DeleteOpts { deleteVolumes = False, force = False }
804684
805685-- | Timestamp alias.
806686type Timestamp = Integer
@@ -828,50 +708,18 @@ defaultLogOpts = LogOpts { stdout = True
828708 , tail = All
829709 }
830710
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)
839−
840−-- | Sensible defalut for create network options
841−defaultCreateNetworkOpts :: Text -> CreateNetworkOpts
842−defaultCreateNetworkOpts name =
843− CreateNetworkOpts
844− { createNetworkName = name
845− , createNetworkCheckDuplicate = False
846− , createNetworkDriver = "bridge"
847− , createNetworkInternal = True
848− , createNetworkEnableIPv6 = False
849− }
850−
851−instance ToJSON CreateNetworkOpts where
852− toJSON opts =
853− object
854− [ "Name" .= createNetworkName opts
855− , "CheckDuplicate" .= createNetworkCheckDuplicate opts
856− , "Driver" .= createNetworkDriver opts
857− , "Internal" .= createNetworkInternal opts
858− , "EnableIPv6" .= createNetworkEnableIPv6 opts
859− ]
860−
861711-- TOOD: Add support for SELinux Volume labels (eg. "ro,z" or "ro/Z")
862712-- | Set permissions on volumes that you mount in the container.
863713data VolumePermission = ReadWrite | ReadOnly deriving (Eq, Show, Generic)
864714
865715instance ToJSON VolumePermission where
866716 toJSON ReadWrite = "rw"
867− toJSON ReadOnly = "ro"
717+ toJSON ReadOnly = "ro"
868718
869719instance FromJSON VolumePermission where
870720 parseJSON "rw" = return ReadWrite
871721 parseJSON "ro" = return ReadOnly
872− parseJSON "RW" = return ReadWrite
873− parseJSON "RO" = return ReadOnly
874− parseJSON _ = fail "Failed to parse VolumePermission"
722+ parseJSON _ = fail "Failed to parse VolumePermission"
875723
876724-- | Used for marking a directory in the container as "exposed" hence
877725-- taking it outside of the COW filesystem and making it mountable
@@ -884,18 +732,16 @@ instance FromJSON VolumePermission where
884732-- docker run --name app -v \/opt\/data -it myapp:latest
885733-- docker run --name app2 --volumes-from app \/bin\/bash -c "ls -l \/opt\/data"
886734-- @
887−newtype Volume = Volume FilePath deriving (Eq, Show)
735+newtype Volumes = Volumes [FilePath] deriving (Eq, Show)
888736
889−instance {-# OVERLAPPING #-} ToJSON [Volume] where
890− toJSON [] = emptyJsonObject
891− toJSON (v:vs) = toJsonKey (v:vs) getKey
892− where getKey (Volume v) = v
893−
894−instance {-# OVERLAPPING #-} FromJSON [Volume] where
895− parseJSON (JSON.Object o) = return $ map (Volume . T.unpack) $ HM.keys o
896− parseJSON (JSON.Null) = return []
897− parseJSON _ = fail "Volume is not an object"
737+instance FromJSON Volumes where
738+ parseJSON (JSON.Object o) = return $ Volumes $ map T.unpack $ HM.keys o
739+ parseJSON _ = fail "Volumes is not an object"
898740
741+instance ToJSON Volumes where
742+ toJSON (Volumes []) = JSON.Object HM.empty
743+ toJSON (Volumes (v:vs)) = JSON.Object $ foldl f HM.empty (v:vs)
744+ where f acc k = HM.insert (T.pack k) (JSON.Object HM.empty) acc
899745
900746data Bind = Bind { hostSrc :: Text
901747 , containerDest :: Text
@@ -904,10 +750,10 @@ data Bind = Bind { hostSrc :: Text
904750
905751instance FromJSON Bind where
906752 parseJSON (JSON.String t) = case T.split (== ':') t of
907− [src, dest] -> return $ Bind src dest Nothing
753+ [src, dest] -> return $ Bind src dest Nothing
908754 [src, dest, "rw"] -> return $ Bind src dest $ Just ReadWrite
909755 [src, dest, "ro"] -> return $ Bind src dest $ Just ReadOnly
910− _ -> fail "Could not parse Bind"
756+ _ -> fail "Could not parse Bind"
911757 parseJSON _ = fail "Bind is not a string"
912758
913759data Device = Device {
@@ -930,15 +776,15 @@ data VolumeFrom = VolumeFrom ContainerName (Maybe VolumePermission) deriving (Eq
930776
931777instance FromJSON VolumeFrom where
932778 parseJSON (JSON.String t) = case T.split (== ':') t of
933− [vol] -> return $ VolumeFrom vol Nothing
779+ [vol] -> return $ VolumeFrom vol Nothing
934780 [vol, "rw"] -> return $ VolumeFrom vol $ Just ReadWrite
935781 [vol, "ro"] -> return $ VolumeFrom vol $ Just ReadOnly
936− _ -> fail "Could not parse VolumeFrom"
782+ _ -> fail "Could not parse VolumeFrom"
937783 parseJSON _ = fail "VolumeFrom is not a string"
938784
939785instance ToJSON VolumeFrom where
940786 toJSON (VolumeFrom n p) = case p of
941− Nothing -> toJSON $ n <> ":" <> "rw"
787+ Nothing -> toJSON $ n <> ":" <> "rw"
942788 Just per -> toJSON $ n <> ":" <> (T.pack $ show per)
943789
944790instance ToJSON Bind where
@@ -950,63 +796,63 @@ data Link = Link Text (Maybe Text) deriving (Eq, Show)
950796
951797instance FromJSON Link where
952798 parseJSON (JSON.String t) = case T.split (== ':') t of
953− [f] -> return $ Link f Nothing
799+ [f] -> return $ Link f Nothing
954800 [f,s] -> return $ Link f $ Just s
955− _ -> fail "Could not parse Link"
801+ _ -> fail "Could not parse Link"
956802 parseJSON _ = fail "Link is not a string"
957803
958804instance ToJSON Link where
959805 toJSON (Link n1 n2) = toJSON $ case n2 of
960806 Nothing -> T.concat[n1, ":", n1] -- use same name in container
961− Just n -> T.concat[n1, ":", n] -- used specified name in container
807+ Just n -> T.concat[n1, ":", n] -- used specified name in container
962808
963809-- { "Type": "<driver_name>", "Config": {"key1": "val1"} }
964810data LogDriverType = JsonFile | Syslog | Journald | Gelf | Fluentd | AwsLogs | Splunk | Etwlogs | LoggingDisabled deriving (Eq, Show)
965811
966812instance FromJSON LogDriverType where
967813 parseJSON (JSON.String "json-file") = return JsonFile
968− parseJSON (JSON.String "syslog") = return Syslog
969− parseJSON (JSON.String "journald") = return Journald
970− parseJSON (JSON.String "gelf") = return Gelf
971− parseJSON (JSON.String "fluentd") = return Fluentd
972− parseJSON (JSON.String "awslogs") = return AwsLogs
973− parseJSON (JSON.String "splunk") = return Splunk
974− parseJSON (JSON.String "etwlogs") = return Etwlogs
975− parseJSON (JSON.String "none") = return LoggingDisabled
976− parseJSON _ = fail "Unknown LogDriverType"
814+ parseJSON (JSON.String "syslog") = return Syslog
815+ parseJSON (JSON.String "journald") = return Journald
816+ parseJSON (JSON.String "gelf") = return Gelf
817+ parseJSON (JSON.String "fluentd") = return Fluentd
818+ parseJSON (JSON.String "awslogs") = return AwsLogs
819+ parseJSON (JSON.String "splunk") = return Splunk
820+ parseJSON (JSON.String "etwlogs") = return Etwlogs
821+ parseJSON (JSON.String "none") = return LoggingDisabled
822+ parseJSON _ = fail "Unknown LogDriverType"
977823
978824instance ToJSON LogDriverType where
979− toJSON JsonFile = JSON.String "json-file"
980− toJSON Syslog = JSON.String "syslog"
981− toJSON Journald = JSON.String "journald"
982− toJSON Gelf = JSON.String "gelf"
983− toJSON Fluentd = JSON.String "fluentd"
984− toJSON AwsLogs = JSON.String "awslogs"
985− toJSON Splunk = JSON.String "splunk"
986− toJSON Etwlogs = JSON.String "etwlogs"
825+ toJSON JsonFile = JSON.String "json-file"
826+ toJSON Syslog = JSON.String "syslog"
827+ toJSON Journald = JSON.String "journald"
828+ toJSON Gelf = JSON.String "gelf"
829+ toJSON Fluentd = JSON.String "fluentd"
830+ toJSON AwsLogs = JSON.String "awslogs"
831+ toJSON Splunk = JSON.String "splunk"
832+ toJSON Etwlogs = JSON.String "etwlogs"
987833 toJSON LoggingDisabled = JSON.String "none"
988834
989−data LogDriverOption = LogDriverOption Name Value deriving (Eq, Show)
835+newtype LogDriverOptions = LogDriverOptions (M.Map Text Text) deriving (Eq, Show)
990836
991−instance {-# OVERLAPPING #-} ToJSON [LogDriverOption] where
992− toJSON [] = emptyJsonObject
993− toJSON (o:os) = toJsonKeyVal (o:os) key val
994− where key (LogDriverOption n _) = T.unpack n
995− val (LogDriverOption _ v) = v
837+instance FromJSON LogDriverOptions where
838+ parseJSON (JSON.Object o) = do
839+ LogDriverOptions <$> HM.foldlWithKey' f (return M.empty) o
996840
997−instance {-# OVERLAPPING #-} FromJSON [LogDriverOption] where
998− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
999− where f accM k v = do
841+ where
842+ f accM k (JSON.String v) = do
1000843 acc <- accM
1001− value <- parseJSON v
1002− return $ (LogDriverOption k value):acc
1003− parseJSON JSON.Null = return []
1004− parseJSON _ = fail "Failed to parse LogDriverOptions"
844+ return $ M.insert k v acc
845+ f _ _ _ = fail "Value of LogDriverOptions is not a string"
846+
847+ parseJSON JSON.Null = return $ LogDriverOptions M.empty
848+ parseJSON _ = fail "LogDriverOptions is not an object"
1005849
1006−data LogDriverConfig = LogDriverConfig LogDriverType [LogDriverOption] deriving (Eq, Show)
850+instance ToJSON LogDriverOptions where
851+ toJSON (LogDriverOptions mp) = toJSON mp
852+
853+data LogDriverConfig = LogDriverConfig LogDriverType (Maybe LogDriverOptions) deriving (Eq, Show)
1007854
1008855instance ToJSON LogDriverConfig where
1009− toJSON (LogDriverConfig driverType []) = object ["Type" .= driverType]
1010856 toJSON (LogDriverConfig driverType driverOptions) = object ["Type" .= driverType, "Config" .= driverOptions]
1011857
1012858instance FromJSON LogDriverConfig where
@@ -1017,41 +863,19 @@ instance FromJSON LogDriverConfig where
1017863 parseJSON _ = fail "LogDriverConfig is not an object"
1018864
1019865-- TODO: Add container:<name|id> mode
1020−data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
866+data NetworkMode = Bridge | Host | NetworkDisabled
1021867 deriving (Eq, Show, Ord)
1022868
1023869instance FromJSON NetworkMode where
1024− parseJSON (JSON.String "bridge") = return NetworkBridge
1025− parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
1026− parseJSON (JSON.String "none") = return NetworkDisabled
1027− parseJSON (JSON.String n) = return $ NetworkNamed n
1028− parseJSON _ = fail "Unknown NetworkMode"
870+ parseJSON (JSON.String "bridge") = return Bridge
871+ parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
872+ parseJSON (JSON.String "none") = return NetworkDisabled
873+ parseJSON _ = fail "Unknown NetworkMode"
1029874
1030875instance ToJSON NetworkMode where
1031− toJSON NetworkBridge = JSON.String "bridge"
1032− toJSON NetworkHost = JSON.String "host"
876+ toJSON Bridge = JSON.String "bridge"
877+ toJSON Host = JSON.String "host"
1033878 toJSON NetworkDisabled = JSON.String "none"
1034− toJSON (NetworkNamed n) = JSON.String n
1035−
1036−newtype NetworkID = NetworkID Text
1037− deriving (Eq, Show)
1038−
1039−-- | Used for extracting the id of the container from the newtype
1040−fromNetworkID :: NetworkID -> Text
1041−fromNetworkID (NetworkID t) = t
1042−
1043−-- | Used for parsing a Text value into a NetworkID.
1044−toNetworkID :: Text -> Maybe NetworkID
1045−toNetworkID t = Just $ NetworkID t
1046−
1047−instance FromJSON NetworkID where
1048− parseJSON (JSON.Object o) = do
1049− nid <- o .: "Id"
1050− return $ NetworkID nid
1051− parseJSON _ = fail "NetworkID is not an object."
1052−
1053−instance ToJSON NetworkID where
1054− toJSON (NetworkID nid) = object ["Id" .= nid]
1055879
1056880data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
1057881
@@ -1067,7 +891,7 @@ instance FromJSON PortType where
1067891 parseJSON val = case val of
1068892 "tcp" -> return TCP
1069893 "udp" -> return UDP
1070− _ -> fail "PortType: Invalid port type."
894+ _ -> fail "PortType: Invalid port type."
1071895
1072896-- newtype NetworkInterface = NetworkInterface Text deriving (Eq, Show)
1073897--
@@ -1084,6 +908,13 @@ instance FromJSON PortType where
1084908-- interface like `127.0.0.1`.
1085909-- __NOTE__: We should disallow duplicate port bindings as the ToJSON
1086910-- instance will only send the last one.
911+newtype PortBindings = PortBindings [PortBinding]
912+ deriving (Eq, Show)
913+
914+instance Monoid PortBindings where
915+ mempty = PortBindings []
916+ mappend (PortBindings p1) (PortBindings p2) = PortBindings (p1 ++ p2)
917+
1087918-- { <port>/<protocol>: [{ "HostPort": "<port>" }] }
1088919data PortBinding = PortBinding {
1089920 containerPort :: Port
@@ -1095,61 +926,28 @@ portAndType2Text :: Port -> PortType -> Text
1095926portAndType2Text p t = (T.pack $ show p) <> "/" <> (T.pack $ show t)
1096927
1097928
1098−-- | A helper function to more easily add a bind mount to existing
1099−-- "CreateOpts" records.
1100−addBind :: Bind -> CreateOpts -> CreateOpts
1101−addBind b c = c{hostConfig=hc{binds=obs <> [b]}}
1102− where hc = hostConfig c
1103− obs = binds $ hostConfig c
1104−
1105−-- | Helper function for adding a Command to and existing
1106−-- CreateOpts record.
1107−setCmd :: Text -> CreateOpts -> CreateOpts
1108−setCmd ccmd c = c{containerConfig=cc{cmd=[ccmd]}}
1109− where cc = containerConfig c
1110−
1111−-- | Helper function for adding a "Link" to and existing
1112−-- CreateOpts record.
1113−addLink :: Link -> CreateOpts -> CreateOpts
1114−addLink l c = c{hostConfig=hc{links=ols <> [l]}}
929+addBinds :: [Bind] -> CreateOpts -> CreateOpts
930+addBinds bs c = c{hostConfig=hc{binds=bs}}
1115931 where hc = hostConfig c
1116− ols = links $ hostConfig c
1117−
1118−-- | Helper function for adding a "Volume" to and existing
1119−-- CreateOpts record.
1120−addVolume :: Volume -> CreateOpts -> CreateOpts
1121−addVolume v c = c{containerConfig=cc{volumes=oldvs <> [v]}}
1122− where cc = containerConfig c
1123− oldvs = volumes cc
1124−
1125−-- | Helper function for adding a "VolumeFrom" to and existing
1126−-- CreateOpts record.
1127−addVolumeFrom :: VolumeFrom -> CreateOpts -> CreateOpts
1128−addVolumeFrom vf c = c{hostConfig=hc{volumesFrom=oldvfs <> [vf]}}
1129− where hc = hostConfig c
1130− oldvfs = volumesFrom hc
1131932
1132933-- | A convenience function that adds PortBindings to and exiting
1133934-- "CreateOpts" record. Useful with 'defaultCreateOpts'
1134935-- Example:
1135936--
1136937-- >>> let pb = PortBinding 80 TCP [HostPort "0.0.0.0" 8000]
1137−-- >>> addPortBinding pb $ defaultCreateOpts "nginx:latest"
1138−addPortBinding :: PortBinding -> CreateOpts -> CreateOpts
1139−addPortBinding pb c = c{hostConfig=hc{portBindings=pbs <> [pb]}}
938+-- >>> addPortBinding (defaultCreateOpts "nginx:latest") pb
939+addPortBinding :: CreateOpts -> PortBinding -> CreateOpts
940+addPortBinding c pb = c{hostConfig=hc{portBindings=pbs <> PortBindings [pb]}}
1140941 where hc = hostConfig c
1141942 pbs = portBindings $ hostConfig c
1142943
1143−-- | Helper function for adding a "ExposedPort" to and existing
1144−-- CreateOpts record.
1145−addExposedPort :: ExposedPort -> CreateOpts -> CreateOpts
1146−addExposedPort ep c = c{containerConfig=cc{exposedPorts=oldeps <> [ep]}}
1147− where cc = containerConfig c
1148− oldeps = exposedPorts cc
944+instance ToJSON PortBinding where
945+ toJSON (PortBinding {..}) = object [portAndType2Text containerPort portType .= hostPorts]
1149946
947+instance FromJSON PortBindings where
948+ parseJSON (JSON.Object o) = do
949+ PortBindings <$> HM.foldlWithKey' f (return []) o
1150950
1151−instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1152− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
1153951 where
1154952 f accM k v = case T.split (== '/') k of
1155953 [port', portType'] -> do
@@ -1158,15 +956,16 @@ instance {-# OVERLAPPING #-} FromJSON [PortBinding] where
1158956 acc <- accM
1159957 hps <- parseJSON v
1160958 return $ (PortBinding port portType hps):acc
1161− _ -> fail "Could not parse PortBindings"
1162− parseJSON (JSON.Null) = return []
959+ _ ->
960+ fail "Could not parse PortBindings"
1163961 parseJSON _ = fail "PortBindings is not an object"
1164962
1165−instance {-# OVERLAPPING #-} ToJSON [PortBinding] where
1166− toJSON [] = emptyJsonObject
1167− toJSON (p:ps) = toJsonKeyVal (p:ps) key val
1168− where key p = T.unpack $ portAndType2Text (containerPort p) (portType p)
1169− val p = hostPorts p
963+instance ToJSON PortBindings where
964+ toJSON (PortBindings []) = JSON.Object HM.empty
965+ toJSON (PortBindings (p:ps)) = JSON.Object $ foldl f HM.empty (p:ps)
966+ where mKey p = portAndType2Text (containerPort p) (portType p)
967+ mVal p = toJSON $ hostPorts p
968+ f acc p = HM.insert (mKey p) (mVal p) acc
1170969
1171970data HostPort = HostPort {
1172971 hostIp :: Text
@@ -1197,7 +996,7 @@ instance FromJSON RestartPolicy where
1197996 "on-failure" -> do
1198997 retry <- o .: "MaximumRetryCount"
1199998 return $ RestartOnFailure retry
1200− "no" -> return RestartOff
999+ "off" -> return RestartOff
12011000 _ -> fail "Could not parse RestartPolicy"
12021001 parseJSON _ = fail "RestartPolicy is not an object"
12031002
@@ -1205,7 +1004,7 @@ instance ToJSON RestartPolicy where
12051004 toJSON RestartAlways = object ["Name" .= JSON.String "always"]
12061005 toJSON RestartUnlessStopped = object ["Name" .= JSON.String "unless-stopped"]
12071006 toJSON (RestartOnFailure c) = object ["Name" .= JSON.String "on-failure", "MaximumRetryCount" .= c]
1208− toJSON RestartOff = object ["Name" .= JSON.String "no"]
1007+ toJSON RestartOff = object ["Name" .= JSON.String "off"]
12091008
12101009data Isolation = Default | Process | Hyperv deriving (Eq, Show)
12111010
@@ -1219,7 +1018,7 @@ data HostConfig = HostConfig
12191018 , containerIDFile :: Maybe FilePath -- 1.24: Only in responses, not create
12201019 , logConfig :: LogDriverConfig
12211020 , networkMode :: NetworkMode
1222− , portBindings :: [PortBinding]
1021+ , portBindings :: PortBindings
12231022 , restartPolicy :: RestartPolicy
12241023 , volumeDriver :: Maybe Text
12251024 , volumesFrom :: [VolumeFrom]
@@ -1378,22 +1177,6 @@ instance ToJSON DeviceRate where
13781177 , "Rate" .= r
13791178 ]
13801179
1381−data MemoryConstraintSize = B | MB | GB deriving (Eq, Show)
1382−
1383−data MemoryConstraint = MemoryConstraint Integer MemoryConstraintSize deriving (Eq, Show)
1384−
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
1389−
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"
1396−
13971180data ContainerResources = ContainerResources {
13981181 cpuShares :: Maybe Integer
13991182 -- , cgroupParent :: Text -- 1.24: Missing from inspecting container details... Going to omit for now.
@@ -1409,12 +1192,12 @@ data ContainerResources = ContainerResources {
14091192 , cpusetMems :: Maybe Text
14101193 , devices :: [Device]
14111194 -- , diskQuota :: Integer -- Don't see this ins 1.24.
1412− , kernelMemory :: Maybe MemoryConstraint
1413− , memory :: Maybe MemoryConstraint
1414− , memoryReservation :: Maybe MemoryConstraint
1415− , memorySwap :: Maybe MemoryConstraint
1195+ , kernelMemory :: Maybe Integer
1196+ , memory :: Maybe Integer
1197+ , memoryReservation :: Maybe Integer
1198+ , memorySwap :: Maybe Integer
14161199 -- , memorySwappiness :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
1417− , oomKillDisable :: Maybe Bool
1200+ , oomKillDisable :: Bool
14181201 -- , pidsLimit :: Integer -- 1.24: Missing from inspecting container details... Going to omit for now.
14191202 , ulimits :: [Ulimit]
14201203 -- TODO: Missing from 1.24
@@ -1452,59 +1235,45 @@ instance FromJSON EnvVar where
14521235 parseJSON _ = fail "EnvVar is not a string"
14531236
14541237instance ToJSON EnvVar where
1455− toJSON (EnvVar n v) = JSON.String $ n <> T.pack "=" <> v
1238+ toJSON (EnvVar n v) = object [n .= v]
14561239
1457−-- | ExposedPort represents a port (and it's type)
1240+-- | ExposedPorts represent a enumeraton of all the ports (and their type)
14581241-- that a container should expose to other containers or the host system.
1459−-- `NOTE`: This does not automatically expose the port onto the host
1460−-- system but rather it just tags it. It's best to be used with
1242+-- `NOTE`: This does not automatically expose the ports onto the host
1243+-- system but rather it just tags them. It's best to be used with
14611244-- the PublishAllPorts flag. It is also useful for
14621245-- the daemon to know which Environment variables to
14631246-- inject into a container linking to our container.
14641247-- Example linking a Postgres container named db would inject the following
14651248-- environment variables automatically if we set the corresponding
14661249--
1467−-- ExposedPort:
1250+-- ExposedPorts:
14681251--
14691252-- @
14701253-- DB_PORT_5432_TCP_PORT="5432"
14711254-- DB_PORT_5432_TCP_PROTO="tcp"
14721255-- DB_PORT_5432_TCP="tcp://172.17.0.1:5432"
14731256-- @
1474−data ExposedPort = ExposedPort Port PortType deriving (Eq, Show)
1257+newtype ExposedPorts = ExposedPorts (M.Map Port PortType) deriving (Eq, Show)
1258+-- JP: Should this be ExposedPorts [(Port, PortType)]?
1259+
1260+instance FromJSON ExposedPorts where
1261+ parseJSON (JSON.Object o) = do
1262+ ExposedPorts <$> HM.foldlWithKey' f (return M.empty) o
14751263
1476−instance {-# OVERLAPPING #-} FromJSON [ExposedPort] where
1477− parseJSON (JSON.Object o) = HM.foldlWithKey' f (return []) o
14781264 where
14791265 f accM k _ = case T.split (== '/') k of
14801266 [port', portType'] -> do
14811267 port <- parseIntegerText port'
14821268 portType <- parseJSON $ JSON.String portType'
14831269 acc <- accM
1484− return $ (ExposedPort port portType):acc
1485− _ -> fail "Could not parse ExposedPorts"
1486− parseJSON (JSON.Null) = return []
1487− parseJSON _ = fail "ExposedPorts is not an object"
1488−
1489−instance {-# OVERLAPPING #-} ToJSON [ExposedPort] where
1490− toJSON [] = emptyJsonObject
1491− toJSON (p:ps) = toJsonKey (p:ps) key
1492− where key (ExposedPort p t) = show p <> slash <> show t
1493− slash = T.unpack "/"
1270+ return $ M.insert port portType acc
1271+ _ ->
1272+ fail "Could not parse ExposedPorts"
1273+ parseJSON _ = fail "ExposedPorts is not an object."
14941274
1495−data Entrypoint = Entrypoint [T.Text] deriving (Eq, Show, Generic)
1496−
1497−instance ToJSON Entrypoint where
1498− toJSON (Entrypoint (e:es)) = toJSON (e:es)
1499− toJSON (Entrypoint []) = JSON.Null
1500−
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"
1275+instance ToJSON ExposedPorts where
1276+ toJSON (ExposedPorts kvs) = object [((T.pack $ show p) <> "/" <> (T.pack $ show t)) .= JSON.Object HM.empty | (p,t) <- (M.toList kvs)]
15081277
15091278
15101279data ContainerConfig = ContainerConfig {
@@ -1514,7 +1283,7 @@ data ContainerConfig = ContainerConfig {
15141283 , attachStdin :: Bool
15151284 , attachStdout :: Bool
15161285 , attachStderr :: Bool
1517− , exposedPorts :: [ExposedPort]
1286+ , exposedPorts :: Maybe ExposedPorts -- Note: Should we expand the JSON instance and take away the Maybe?
15181287 -- , publishService :: Text -- Don't see this in 1.24
15191288 , tty :: Bool
15201289 , openStdin :: Bool
@@ -1523,70 +1292,27 @@ data ContainerConfig = ContainerConfig {
15231292 , cmd :: [Text]
15241293 -- , argsEscaped :: Bool -- Don't see this in 1.24
15251294 , image :: Text
1526− , volumes :: [Volume]
1295+ , volumes :: Maybe Volumes
15271296 , workingDir :: Maybe FilePath
1528− , entrypoint :: Entrypoint
1297+ , entrypoint :: Maybe Text -- Can be null?
15291298 , networkDisabled :: Maybe Bool -- Note: Should we expand the JSON instance and take away the Maybe? Null is False?
15301299 , macAddress :: Maybe Text
15311300 -- , onBuild :: Maybe Text -- For 1.24, only see this in the inspect response.
1532− , labels :: [Label]
1301+ , labels :: Maybe Labels
15331302 , stopSignal :: Signal
15341303 } deriving (Eq, Show, Generic)
15351304
1536−
15371305instance ToJSON ContainerConfig where
15381306 toJSON = genericToJSON defaultOptions {
15391307 fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
15401308
15411309instance FromJSON ContainerConfig where
1542− parseJSON (JSON.Object o) = do
1543− hostname <- o .:? "Hostname"
1544− domainname <- o .:? "Domainname"
1545− user <- o .:? "User"
1546− attachStdin <- o .: "AttachStdin"
1547− attachStdout <- o .: "AttachStdout"
1548− attachStderr <- o .: "AttachStderr"
1549− exposedPorts <- o .:? "ExposedPorts" .!= []
1550− tty <- o .: "Tty"
1551− openStdin <- o .: "OpenStdin"
1552− stdinOnce <- o .: "StdinOnce"
1553− env <- o .: "Env"
1554− cmd <- o .: "Cmd"
1555− image <- o .: "Image"
1556− volumes <- o .: "Volumes"
1557− workingDir <- o .:? "WorkingDir"
1558− entrypoint <- o .: "Entrypoint"
1559− networkDisabled <- o .:? "networkDisabled"
1560− macAddress <- o .:? "MacAddress"
1561− labels <- o .:? "Labels" .!= []
1562− stopSignal <- o .: "StopSignal"
1563− return $ ContainerConfig hostname domainname user attachStdin attachStdout attachStderr exposedPorts tty openStdin stdinOnce env cmd image volumes workingDir entrypoint networkDisabled
1564− macAddress labels stopSignal
1565− parseJSON _ = fail "NetworkSettings is not an object."
1310+ parseJSON = genericParseJSON defaultOptions {
1311+ fieldLabelModifier = (\(x:xs) -> toUpper x : xs)}
15661312
1567−#if MIN_VERSION_base(4,13,0)
1568−parseIntegerText :: (MonadFail m) => Text -> m Integer
1569−#else
15701313parseIntegerText :: (Monad m) => Text -> m Integer
1571−#endif
15721314parseIntegerText t = case readMaybe $ T.unpack t of
15731315 Nothing ->
15741316 fail "Could not parse Integer"
15751317 Just i ->
15761318 return i
1577−
1578−-- | Helper function for converting a data type [a] to a json dictionary
1579−-- like so {"something": {}, "something2": {}}
1580−toJsonKey :: Foldable t => t a -> (a -> String) -> JSON.Value
1581−toJsonKey vs getKey = JSON.Object $ foldl f HM.empty vs
1582− where f acc x = HM.insert (T.pack $ getKey x) (JSON.Object HM.empty) acc
1583−
1584−-- | Helper function for converting a data type [a] to a json dictionary
1585−-- like so {"something": "val1", "something2": "val2"}
1586−toJsonKeyVal :: (Foldable t, JSON.ToJSON r) => t a -> (a -> String) -> (a -> r) -> JSON.Value
1587−toJsonKeyVal vs getKey getVal = JSON.Object $ foldl f HM.empty vs
1588− where f acc x = HM.insert (T.pack $ getKey x) (toJSON $ getVal x) acc
1589−
1590−-- | Helper function that return an empty dictionary "{}"
1591−emptyJsonObject :: JSON.Value
1592−emptyJsonObject = JSON.Object HM.empty