[release] v0.8.0-unstable12
This commit is contained in:
parent
490468ca6f
commit
4a024db90d
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "cosmos-server",
|
"name": "cosmos-server",
|
||||||
"version": "0.8.0-unstable11",
|
"version": "0.8.0-unstable12",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "test-server.js",
|
"main": "test-server.js",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
|
@ -555,8 +555,6 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
|
||||||
Name: container.Name,
|
Name: container.Name,
|
||||||
})
|
})
|
||||||
|
|
||||||
utils.Debug(fmt.Sprintf("CACABOUDIN %v", container.Networks))
|
|
||||||
|
|
||||||
// connect to networks
|
// connect to networks
|
||||||
for netName, netConfig := range container.Networks {
|
for netName, netConfig := range container.Networks {
|
||||||
utils.Log("CreateService: Connecting to network: " + netName)
|
utils.Log("CreateService: Connecting to network: " + netName)
|
||||||
|
|
|
@ -272,22 +272,17 @@ func IsConnectedToASecureCosmosNetwork(self types.ContainerJSON, containerConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
// else check if Cosmos is already connected
|
// else check if Cosmos is already connected
|
||||||
for name, _ := range containerConfig.NetworkSettings.Networks {
|
if os.Getenv("HOSTNAME") != "" {
|
||||||
if name == GetLabel(containerConfig, "cosmos-network-name") {
|
utils.Debug("IsSelfConnectedToASecureCosmosNetwork - " + self.Name + ": is connected to " + GetLabel(containerConfig, "cosmos-network-name"))
|
||||||
if os.Getenv("HOSTNAME") != "" {
|
if(!IsConnectedToNetwork(self, GetLabel(containerConfig, "cosmos-network-name"))) {
|
||||||
if(!IsConnectedToNetwork(self, name)) {
|
err := DockerClient.NetworkConnect(DockerContext, GetLabel(containerConfig, "cosmos-network-name"), os.Getenv("HOSTNAME"), &network.EndpointSettings{})
|
||||||
err := DockerClient.NetworkConnect(DockerContext, name, os.Getenv("HOSTNAME"), &network.EndpointSettings{})
|
if err != nil {
|
||||||
if err != nil {
|
utils.Error("Docker Network Connect EXISTING ", err)
|
||||||
utils.Error("Docker Network Connect EXISTING ", err)
|
return false, err, false
|
||||||
return false, err, false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return true, nil, false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return true, nil, false
|
||||||
return false, nil, false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func ConnectToNetworkIfNotConnected(containerConfig types.ContainerJSON, networkName string) error {
|
func ConnectToNetworkIfNotConnected(containerConfig types.ContainerJSON, networkName string) error {
|
||||||
|
|
Loading…
Reference in a new issue