Bladeren bron

[release] v0.11.0-unstable5

Yann Stepienik 1 jaar geleden
bovenliggende
commit
7f5f87e2b6
4 gewijzigde bestanden met toevoegingen van 8 en 4 verwijderingen
  1. 1 1
      .circleci/config.yml
  2. 1 0
      changelog.md
  3. 1 1
      package.json
  4. 5 2
      src/docker/api_blueprint.go

+ 1 - 1
.circleci/config.yml

@@ -64,7 +64,7 @@ jobs:
           name: Rename ARM Nebula Binary
           name: Rename ARM Nebula Binary
           command: |
           command: |
             mv nebula nebula-arm
             mv nebula nebula-arm
-            mv nebula-cert nebula-cert-arm
+            mv nebula-cert nebula-arm-cert
       
       
       - run:
       - run:
           name: Download and Extract Nebula Binary
           name: Download and Extract Nebula Binary

+ 1 - 0
changelog.md

@@ -6,6 +6,7 @@
  - Added support for cosmos-persistent-env, to persist password when overwriting containers (useful for encrypted or password protected volumes, like databases use)
  - Added support for cosmos-persistent-env, to persist password when overwriting containers (useful for encrypted or password protected volumes, like databases use)
  - Fixed bug where import compose would try to revert a previously created volume when errors occurs
  - Fixed bug where import compose would try to revert a previously created volume when errors occurs
  - Terminal for import now has colours 
  - Terminal for import now has colours 
+ - Fix a bug where ARM CPU would not be able to start Constellation
 
 
 ## Version 0.10.4
 ## Version 0.10.4
  - Encode OpenID .well-known to JSON
  - Encode OpenID .well-known to JSON

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "cosmos-server",
   "name": "cosmos-server",
-  "version": "0.11.0-unstable4",
+  "version": "0.11.0-unstable5",
   "description": "",
   "description": "",
   "main": "test-server.js",
   "main": "test-server.js",
   "bugs": {
   "bugs": {

+ 5 - 2
src/docker/api_blueprint.go

@@ -808,12 +808,15 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
 		for routeIndex, route := range container.Routes {
 		for routeIndex, route := range container.Routes {
 			// check if route already exists
 			// check if route already exists
 			exists := false
 			exists := false
-			for _, configRoute := range configRoutes {
+			existsAt := 0
+			for destRouteIndex, configRoute := range configRoutes {
 				if configRoute.Name == route.Name {
 				if configRoute.Name == route.Name {
 					exists = true
 					exists = true
+					existsAt = destRouteIndex
 					break
 					break
 				}
 				}
 			}
 			}
+
 			if !exists {
 			if !exists {
 				needsHTTPRestart = true
 				needsHTTPRestart = true
 				configRoutes = append([]utils.ProxyRouteConfig{(utils.ProxyRouteConfig)(route)}, configRoutes...)
 				configRoutes = append([]utils.ProxyRouteConfig{(utils.ProxyRouteConfig)(route)}, configRoutes...)
@@ -824,7 +827,7 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
 				// return errors.New("Route already exist")
 				// return errors.New("Route already exist")
 
 
 				//overwrite route
 				//overwrite route
-				configRoutes[routeIndex] = (utils.ProxyRouteConfig)(route)
+				configRoutes[existsAt] = (utils.ProxyRouteConfig)(route)
 				utils.Warn("CreateService: Route " + route.Name + " already exist, overwriting.")
 				utils.Warn("CreateService: Route " + route.Name + " already exist, overwriting.")
 				OnLog(utils.DoWarn("Route " + route.Name + " already exist, overwriting.\n"))
 				OnLog(utils.DoWarn("Route " + route.Name + " already exist, overwriting.\n"))
 			}
 			}