beenull/Cosmos-Server
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[release] v0.8.0-unstable12

Browse source
This commit is contained in:
Yann Stepienik 2023-06-21 16:04:49 +01:00
parent 490468ca6f
commit 4a024db90d
3 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{
"name": "cosmos-server",
"version": "0.8.0-unstable11",
"version": "0.8.0-unstable12",
"description": "",
"main": "test-server.js",
"bugs": {

2
src/docker/api_blueprint.go
View file

@ -555,8 +555,6 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
Name: container.Name,
})
utils.Debug(fmt.Sprintf("CACABOUDIN %v", container.Networks))
// connect to networks
for netName, netConfig := range container.Networks {
utils.Log("CreateService: Connecting to network: " + netName)

21
src/docker/network.go
View file

@ -272,22 +272,17 @@ func IsConnectedToASecureCosmosNetwork(self types.ContainerJSON, containerConfig
}
// else check if Cosmos is already connected
for name, _ := range containerConfig.NetworkSettings.Networks {
if name == GetLabel(containerConfig, "cosmos-network-name") {
if os.Getenv("HOSTNAME") != "" {
if(!IsConnectedToNetwork(self, name)) {
err := DockerClient.NetworkConnect(DockerContext, name, os.Getenv("HOSTNAME"), &network.EndpointSettings{})
if err != nil {
utils.Error("Docker Network Connect EXISTING ", err)
return false, err, false
}
}
if os.Getenv("HOSTNAME") != "" {
utils.Debug("IsSelfConnectedToASecureCosmosNetwork - " + self.Name + ": is connected to " + GetLabel(containerConfig, "cosmos-network-name"))
if(!IsConnectedToNetwork(self, GetLabel(containerConfig, "cosmos-network-name"))) {
err := DockerClient.NetworkConnect(DockerContext, GetLabel(containerConfig, "cosmos-network-name"), os.Getenv("HOSTNAME"), &network.EndpointSettings{})
if err != nil {
utils.Error("Docker Network Connect EXISTING ", err)
return false, err, false
}
return true, nil, false
}
}
return false, nil, false
return true, nil, false
}
func ConnectToNetworkIfNotConnected(containerConfig types.ContainerJSON, networkName string) error {