From 4a024db90d9e5fefc86f1213e6c755b2ae764845 Mon Sep 17 00:00:00 2001 From: Yann Stepienik Date: Wed, 21 Jun 2023 16:04:49 +0100 Subject: [PATCH] [release] v0.8.0-unstable12 --- package.json | 2 +- src/docker/api_blueprint.go | 2 -- src/docker/network.go | 21 ++++++++------------- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 43cfdcf..8ef8574 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.8.0-unstable11", + "version": "0.8.0-unstable12", "description": "", "main": "test-server.js", "bugs": { diff --git a/src/docker/api_blueprint.go b/src/docker/api_blueprint.go index 7d0bb9c..a94daeb 100644 --- a/src/docker/api_blueprint.go +++ b/src/docker/api_blueprint.go @@ -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) diff --git a/src/docker/network.go b/src/docker/network.go index 1bc9546..ef06e1d 100644 --- a/src/docker/network.go +++ b/src/docker/network.go @@ -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 {