From 744b98b3db43154885b472098854a8d71455cfa6 Mon Sep 17 00:00:00 2001 From: Yann Stepienik Date: Fri, 13 Oct 2023 15:44:16 +0100 Subject: [PATCH] [release] v0.10.3 --- changelog.md | 4 ++++ package.json | 2 +- readme.md | 1 + src/constellation/index.go | 11 +++++++++-- src/docker/api_blueprint.go | 4 ++++ 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index b96049c..ba8a37f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +## Version 0.10.3 + - Add missing Constellation logs when creating certs + - Ignore empty links in cosmos-compose + ## Version 0.10.2 - Fix port in host header diff --git a/package.json b/package.json index c75c526..d22d927 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cosmos-server", - "version": "0.10.2", + "version": "0.10.3", "description": "", "main": "test-server.js", "bugs": { diff --git a/readme.md b/readme.md index b4581e1..d2a55e5 100644 --- a/readme.md +++ b/readme.md @@ -8,6 +8,7 @@ null Clayton Stone null +T Morton

--- diff --git a/src/constellation/index.go b/src/constellation/index.go index 6fffcbd..b9f1664 100644 --- a/src/constellation/index.go +++ b/src/constellation/index.go @@ -31,14 +31,21 @@ func Init() { if _, err = os.Stat(utils.CONFIGFOLDER + "ca.crt"); os.IsNotExist(err) { utils.Log("Constellation: ca.crt not found, generating...") // generate ca.crt - generateNebulaCACert("Cosmos - " + utils.GetMainConfig().ConstellationConfig.ConstellationHostname) + + errG := generateNebulaCACert("Cosmos - " + utils.GetMainConfig().ConstellationConfig.ConstellationHostname) + if errG != nil { + utils.Error("Constellation: error while generating ca.crt", errG) + } } // check if cosmos.crt exists if _, err := os.Stat(utils.CONFIGFOLDER + "cosmos.crt"); os.IsNotExist(err) { utils.Log("Constellation: cosmos.crt not found, generating...") // generate cosmos.crt - generateNebulaCert("cosmos", "192.168.201.1/24", "", true) + _,_,_,errG := generateNebulaCert("cosmos", "192.168.201.1/24", "", true) + if errG != nil { + utils.Error("Constellation: error while generating cosmos.crt", errG) + } } // export nebula.yml diff --git a/src/docker/api_blueprint.go b/src/docker/api_blueprint.go index ef24966..c35b580 100644 --- a/src/docker/api_blueprint.go +++ b/src/docker/api_blueprint.go @@ -661,6 +661,10 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string) // Create the networks for links for _, targetContainer := range container.Links { + if targetContainer == "" { + continue + } + if strings.Contains(targetContainer, ":") { err = errors.New("Link network cannot contain ':' please use container name only") utils.Error("CreateService: Rolling back changes because of -- Link network", err)