[release] v0.8.0-unstable9

client/src/api/demo.config.json

@@ -76,7 +76,7 @@
 						"BlockAPIAbuse": false
 					},
 					{
-						"Name": "avidrome",
+						"Name": "Navidrome",
 						"Description": "Expose navidrome to the internet",
 						"UseHost": true,
 						"Host": "navidrome.cosmos-cloud.io",

client/src/pages/home/index.jsx

@@ -21,12 +21,12 @@ export const HomeBackground = () => {
     return (
         <Box sx={{
             position: 'fixed', float: 'left', overflow: 'hidden', zIndex: 0, top: 0, left: 0, right: 0, bottom: 0,
-            // gradient
+            backgroundSize: 'cover',
-            // backgroundImage: isDark ? 
+            backgroundPosition: 'center',
-            //     `linear-gradient(#371d53, #26143a)` : 
+            backgroundRepeat: 'no-repeat',
-            //     `linear-gradient(#e6d3fb, #c8b0e2)`,
+            backgroundAttachment: 'fixed',
+            backgroundImage: customPaper ? `url(${customPaper})` : (isDark ? `url(${wallpaper})` : `url(${wallpaperLight})`),
         }}>
-            <img src={customPaper ? customPaper : (isDark ? wallpaper : wallpaperLight)} style={{ display: 'inline' }} alt="" draggable="false" width="100%" height="100%" />
         </Box>
     );
 };

package.json

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

src/docker/api_blueprint.go

@@ -220,12 +220,13 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
 	var rollbackActions []DockerServiceCreateRollback
 	var err error
 
-	// check if services have the cosmos-force-network-secured label
+	// check if services have the cosmos-force-network-secured label or
+	// if label cosmos-network-name is set ao auto, create a new network
 	for serviceName, service := range serviceRequest.Services {
 		utils.Log(fmt.Sprintf("Checking service %s...", serviceName))
 		OnLog(fmt.Sprintf("Checking service %s...\n", serviceName))
 
-		if service.Labels["cosmos-force-network-secured"] == "true" {
+		if service.Labels["cosmos-force-network-secured"] == "true" || strings.ToLower(service.Labels["cosmos-network-name"]) == "auto" {
 			utils.Log(fmt.Sprintf("Forcing secure %s...", serviceName))
 			OnLog(fmt.Sprintf("Forcing secure %s...\n", serviceName))
 	
@@ -544,15 +545,6 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
 			EndpointsConfig: make(map[string]*network.EndpointSettings),
 		}
 		
-		// Stupid Docker does not want to connect to multiple networks at once
-		/*for netName, netConfig := range container.Networks {
-				networkingConfig.EndpointsConfig[netName] = &network.EndpointSettings{
-						Aliases:     netConfig.Aliases,
-						IPAddress:   netConfig.IPV4Address,
-						GlobalIPv6Address: netConfig.IPV6Address,
-				}
-		}*/
-
 		_, err = DockerClient.ContainerCreate(DockerContext, containerConfig, hostConfig, networkingConfig, nil, container.Name)
 		
 		if err != nil {

src/docker/bootstrap.go

@@ -4,6 +4,8 @@ import (
 	"github.com/azukaar/cosmos-server/src/utils" 
 	"github.com/docker/docker/api/types"
 	"os"
+	"fmt"
+	"regexp"
 )
 
 func BootstrapAllContainersFromTags() []error {
@@ -62,6 +64,23 @@ func BootstrapContainerFromTags(containerID string) error {
 		return err
 	}
 
+	// check if any route has been added to the container
+	config := utils.GetMainConfig()
+	if(!HasLabel(container, "cosmos-network-name")) {
+		for _, route := range config.HTTPConfig.ProxyConfig.Routes {
+				utils.Debug("No cosmos-network-name label on container "+container.Name)
+				pattern := fmt.Sprintf(`(?i)^(([a-z]+):\/\/)?%s(:?[0-9]+)?$`, container.Name[1:])
+				match, _ := regexp.MatchString(pattern, route.Target)
+				if route.Mode == "SERVAPP" && match {
+					utils.Log("Adding cosmos-network-name label to container "+container.Name)
+					AddLabels(container, map[string]string{
+						"cosmos-network-name": "auto",
+					})	
+				}
+		}
+	}
+
+	// Check cosmos-network-name tag
 	isCosmosCon, _, needsUpdate := IsConnectedToASecureCosmosNetwork(selfContainer, container)
 
 	if(IsLabel(container, "cosmos-force-network-secured")) {