on master help sign in
Fix NetworkMode parsing errors
commit79c8ae4ac488dc01a74373f4e1400b42b09176bd authorDeni Bertovic <deni@denibertovic.com> dateTue 9 Jan 2018, 00:45 (9 years ago) parent6cbd31b
1 file changed+9−7
src/Docker/Client/Types.hs+9−7
src/Docker/Client/Types.hs+9−7
@@ -657,7 +657,7 @@ defaultHostConfig = HostConfig {
657657 binds=[]
658658 , containerIDFile=Nothing
659659 , logConfig=LogDriverConfig JsonFile []
660− , networkMode=Bridge
660+ , networkMode=NetworkBridge
661661 , portBindings=[]
662662 , restartPolicy=RestartOff
663663 , volumeDriver=Nothing
@@ -936,19 +936,21 @@ instance FromJSON LogDriverConfig where
936936 parseJSON _ = fail "LogDriverConfig is not an object"
937937
938938-- TODO: Add container:<name|id> mode
939−data NetworkMode = Bridge | Host | NetworkDisabled
939+data NetworkMode = NetworkBridge | NetworkHost | NetworkDisabled | NetworkNamed Text
940940 deriving (Eq, Show, Ord)
941941
942942instance FromJSON NetworkMode where
943− parseJSON (JSON.String "bridge") = return Bridge
944− parseJSON (JSON.String "host") = return Host -- Note: Guessing on these.
943+ parseJSON (JSON.String "bridge") = return NetworkBridge
944+ parseJSON (JSON.String "host") = return NetworkHost -- Note: Guessing on these.
945945 parseJSON (JSON.String "none") = return NetworkDisabled
946+ parseJSON (JSON.String n) = return $ NetworkNamed n
946947 parseJSON _ = fail "Unknown NetworkMode"
947948
948949instance ToJSON NetworkMode where
949− toJSON Bridge = JSON.String "bridge"
950− toJSON Host = JSON.String "host"
951− toJSON NetworkDisabled = JSON.String "none"
950+ toJSON NetworkBridge = JSON.String "bridge"
951+ toJSON NetworkHost = JSON.String "host"
952+ toJSON NetworkDisabled = JSON.String "none"
953+ toJSON (NetworkNamed n) = JSON.String n
952954
953955data PortType = TCP | UDP deriving (Eq, Generic, Read, Ord)
954956