Fix volume handling for prod apps

Author: akclace

cmd/clace/app_cmds.go

@@ -26,6 +26,7 @@ const (
 In the glob, * matches any number of characters, ** matches any number of characters including /.
 all is a shortcut for "*:**", which matches all apps across all domains, including no domain.
 To prevent shell expansion for *, placing the path in quotes is recommended.
+"all" matches all apps across all domains, same as "*:**".
 `
 	PROMOTE_FLAG = "promote"
 	PROMOTE_ARG  = "promote"
@@ -92,7 +93,13 @@ func appCreateCommand(commonFlags []cli.Flag, clientConfig *types.ClientConfig)
 		&cli.StringSliceFlag{
 			Name:    "app-config",
 			Aliases: []string{"conf"},
-			Usage:   "Set an default config option for the app. Format is configKey=configValue",
+			Usage:   "Set an default config option for the app. Format is configKey=configValue, where value has to be encoded in toml formal",
+		})
+
+	flags = append(flags,
+		&cli.StringSliceFlag{
+			Name:  "conf-str",
+			Usage: "Set an default config string value for the app. Format is configKey=configValue",
 		})
 
 	flags = append(flags, dryRunFlag())
@@ -169,6 +176,15 @@ Examples:
 				confMap[key] = value
 			}
 
+			appConfigStr := cCtx.StringSlice("conf-str")
+			for _, def := range appConfigStr {
+				key, value, ok := strings.Cut(def, "=")
+				if !ok {
+					return fmt.Errorf("invalid app config format: %s", def)
+				}
+				confMap[key] = "\"" + value + "\""
+			}
+
 			body := types.CreateAppRequest{
 				Path:             cCtx.Args().Get(1),
 				SourceUrl:        cCtx.Args().Get(0),

cmd/clace/apply_cmd.go

@@ -37,7 +37,7 @@ func initApplyCommand(commonFlags []cli.Flag, clientConfig *types.ClientConfig)
 		UsageText: `args: <filePath> [<appPathGlob>]
 
 <filePath> is the path to the file containing the app configuration.
-<appPathGlob> is an optional second argument.
+<appPathGlob> is an optional second argument, which default to "all".
 ` + PATH_SPEC_HELP +
 			`
 Examples:

internal/app/container_manager.go

@@ -107,15 +107,14 @@ func NewContainerManager(logger *types.Logger, app *App, containerFile string,
 			}
 		}
 
-		logger.Debug().Msgf("Found volumes %v in container file %s", volumes, containerFile)
-
 		if configPort == 0 {
 			// No port configured in app config, use the one from the container file
 			configPort = filePort
 		}
 	}
 
 	volumes = dedupVolumes(append(volumes, containerVolumes...))
+	logger.Debug().Msgf("volumes %v %s", volumes, containerFile)
 
 	if configPort == 0 && lifetime != types.CONTAINER_LIFETIME_COMMAND {
 		return nil, fmt.Errorf("port not specified in app config and in container file %s. Either "+
@@ -805,7 +804,7 @@ func (m *ContainerManager) ProdReload(dryRun bool) error {
 	defer m.stateLock.Unlock()
 	// Start the container with newly built image
 
-	mountArgs, err := m.genMountArgs(sourceDir)
+	m.mountArgs, err = m.genMountArgs(sourceDir)
 	if err != nil {
 		return err
 	}
@@ -823,7 +822,7 @@ func (m *ContainerManager) ProdReload(dryRun bool) error {
 	envMap, _ := m.GetEnvMap()
 
 	err = m.command.RunContainer(m.systemConfig, m.app.AppEntry, containerName,
-		m.GenImageName, m.port, envMap, mountArgs, m.app.Metadata.ContainerOptions)
+		m.GenImageName, m.port, envMap, m.mountArgs, m.app.Metadata.ContainerOptions)
 	if err != nil {
 		return fmt.Errorf("error starting container: %w", err)
 	}