chore: publish next tag 0.4.0-alpha-rc8

See https://github.com/moby/moby/issues/32985.

cli/app/cmd.go

@@ -32,6 +32,14 @@ var localCmdFlag = &cli.BoolFlag{
 	Destination: &localCmd,
 }
 
+var remoteUser string
+var remoteUserFlag = &cli.StringFlag{
+	Name:        "user, u",
+	Value:       "",
+	Usage:       "User to run command within a service context",
+	Destination: &remoteUser,
+}
+
 var appCmdCommand = cli.Command{
 	Name:    "command",
 	Aliases: []string{"cmd"},
@@ -52,18 +60,15 @@ Example:
 	Flags: []cli.Flag{
 		internal.DebugFlag,
 		localCmdFlag,
+		remoteUserFlag,
 	},
 	BashComplete: autocomplete.AppNameComplete,
 	Before:       internal.SubCommandBefore,
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		if len(c.Args()) <= 2 && !localCmd {
+		if localCmd && remoteUser != "" {
-			internal.ShowSubcommandHelpAndError(c, errors.New("missing <service>/<command>? did you mean to pass --local?"))
+			internal.ShowSubcommandHelpAndError(c, errors.New("cannot use --local & <user> together"))
-		}
-
-		if len(c.Args()) > 2 && localCmd {
-			internal.ShowSubcommandHelpAndError(c, errors.New("cannot specify <service> and --local together"))
 		}
 
 		abraSh := path.Join(config.RECIPES_DIR, app.Recipe, "abra.sh")
@@ -74,6 +79,20 @@ Example:
 			logrus.Fatal(err)
 		}
 
+		var parsedCmdArgs string
+		var cmdArgsIdx int
+		var hasCmdArgs bool
+		for idx, arg := range c.Args() {
+			if arg == "--" {
+				cmdArgsIdx = idx
+				hasCmdArgs = true
+			}
+
+			if hasCmdArgs && idx > cmdArgsIdx {
+				parsedCmdArgs += fmt.Sprintf("%s ", c.Args().Get(idx))
+			}
+		}
+
 		if localCmd {
 			cmdName := c.Args().Get(1)
 			if err := ensureCommand(abraSh, app.Recipe, cmdName); err != nil {
@@ -82,8 +101,17 @@ Example:
 
 			logrus.Debugf("--local detected, running %s on local work station", cmdName)
 
-			sourceAndExec := fmt.Sprintf("TARGET=local; APP_NAME=%s; . %s; %s", app.StackName(), abraSh, cmdName)
+			var sourceAndExec string
+			if hasCmdArgs {
+				logrus.Debugf("parsed following command arguments: %s", parsedCmdArgs)
+				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; . %s; %s %s", app.StackName(), abraSh, cmdName, parsedCmdArgs)
+			} else {
+				logrus.Debug("did not detect any command arguments")
+				sourceAndExec = fmt.Sprintf("TARGET=local; APP_NAME=%s; . %s; %s", app.StackName(), abraSh, cmdName)
+			}
+
 			cmd := exec.Command("/bin/sh", "-c", sourceAndExec)
+
 			if err := internal.RunCmd(cmd); err != nil {
 				logrus.Fatal(err)
 			}
@@ -113,20 +141,6 @@ Example:
 
 			logrus.Debugf("running command %s within the context of %s_%s", cmdName, app.StackName(), targetServiceName)
 
-			var parsedCmdArgs string
-			var cmdArgsIdx int
-			var hasCmdArgs bool
-			for idx, arg := range c.Args() {
-				if arg == "--" {
-					cmdArgsIdx = idx
-					hasCmdArgs = true
-				}
-
-				if hasCmdArgs && idx > cmdArgsIdx {
-					parsedCmdArgs += fmt.Sprintf("%s ", c.Args().Get(idx))
-				}
-			}
-
 			if hasCmdArgs {
 				logrus.Debugf("parsed following command arguments: %s", parsedCmdArgs)
 			} else {
@@ -200,6 +214,11 @@ func runCmdRemote(app config.App, abraSh, serviceName, cmdName, cmdArgs string)
 		Tty:          true,
 	}
 
+	if remoteUser != "" {
+		logrus.Debugf("running command with user %s", remoteUser)
+		execCreateOpts.User = remoteUser
+	}
+
 	// FIXME: avoid instantiating a new CLI
 	dcli, err := command.NewDockerCli()
 	if err != nil {

cli/app/logs.go

@@ -30,7 +30,7 @@ var logOpts = types.ContainerLogsOptions{
 
 // stackLogs lists logs for all stack services
 func stackLogs(c *cli.Context, app config.App, client *dockerClient.Client) {
-	filters, err := app.Filters()
+	filters, err := app.Filters(true, false)
 	if err != nil {
 		logrus.Fatal(err)
 	}

cli/app/ps.go

@@ -66,7 +66,7 @@ var appPsCommand = cli.Command{
 
 // showPSOutput renders ps output.
 func showPSOutput(c *cli.Context, app config.App, cl *dockerClient.Client) {
-	filters, err := app.Filters()
+	filters, err := app.Filters(true, true)
 	if err != nil {
 		logrus.Fatal(err)
 	}

cli/app/remove.go

@@ -65,7 +65,7 @@ var appRemoveCommand = cli.Command{
 			logrus.Fatalf("%s is still deployed. Run \"abra app undeploy %s\"", app.Name, app.Name)
 		}
 
-		fs, err := app.Filters()
+		fs, err := app.Filters(false, false)
 		if err != nil {
 			logrus.Fatal(err)
 		}
@@ -114,6 +114,11 @@ var appRemoveCommand = cli.Command{
 			logrus.Info("no secrets to remove")
 		}
 
+		fs, err = app.Filters(false, true)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+
 		volumeListOKBody, err := cl.VolumeList(context.Background(), fs)
 		volumeList := volumeListOKBody.Volumes
 		if err != nil {

cli/app/secret.go

@@ -216,7 +216,7 @@ Example:
 			logrus.Fatal(err)
 		}
 
-		filters, err := app.Filters()
+		filters, err := app.Filters(false, false)
 		if err != nil {
 			logrus.Fatal(err)
 		}
@@ -293,7 +293,7 @@ var appSecretLsCommand = cli.Command{
 			logrus.Fatal(err)
 		}
 
-		filters, err := app.Filters()
+		filters, err := app.Filters(false, false)
 		if err != nil {
 			logrus.Fatal(err)
 		}

cli/app/volume.go

@@ -26,7 +26,7 @@ var appVolumeListCommand = cli.Command{
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		filters, err := app.Filters()
+		filters, err := app.Filters(false, true)
 		if err != nil {
 			logrus.Fatal(err)
 		}
@@ -80,7 +80,7 @@ Passing "--force/-f" will select all volumes for removal. Be careful.
 	Action: func(c *cli.Context) error {
 		app := internal.ValidateApp(c)
 
-		filters, err := app.Filters()
+		filters, err := app.Filters(false, true)
 		if err != nil {
 			logrus.Fatal(err)
 		}

pkg/config/app.go

@@ -64,8 +64,13 @@ func (a App) StackName() string {
 	return stackName
 }
 
-// Filters retrieves exact app filters for querying the container runtime.
+// Filters retrieves exact app filters for querying the container runtime. Due
-func (a App) Filters() (filters.Args, error) {
+// to upstream issues, filtering works different depending on what you're
+// querying. So, for example, secrets don't work with regex! The caller needs
+// to implement their own validation that the right secrets are matched. In
+// order to handle these cases, we provide the `appendServiceNames` /
+// `exactMatch` modifiers.
+func (a App) Filters(appendServiceNames, exactMatch bool) (filters.Args, error) {
 	filters := filters.NewArgs()
 
 	composeFiles, err := GetAppComposeFiles(a.Recipe, a.Env)
@@ -80,7 +85,22 @@ func (a App) Filters() (filters.Args, error) {
 	}
 
 	for _, service := range compose.Services {
-		filter := fmt.Sprintf("^%s_%s", a.StackName(), service.Name)
+		var filter string
+
+		if appendServiceNames {
+			if exactMatch {
+				filter = fmt.Sprintf("^%s_%s", a.StackName(), service.Name)
+			} else {
+				filter = fmt.Sprintf("%s_%s", a.StackName(), service.Name)
+			}
+		} else {
+			if exactMatch {
+				filter = fmt.Sprintf("^%s", a.StackName())
+			} else {
+				filter = fmt.Sprintf("%s", a.StackName())
+			}
+		}
+
 		filters.Add("name", filter)
 	}
 

scripts/installer/installer

@@ -2,7 +2,7 @@
 
 ABRA_VERSION="0.3.0-alpha"
 ABRA_RELEASE_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$ABRA_VERSION"
-RC_VERSION="0.4.0-alpha-rc7"
+RC_VERSION="0.4.0-alpha-rc8"
 RC_VERSION_URL="https://git.coopcloud.tech/api/v1/repos/coop-cloud/abra/releases/tags/$RC_VERSION"
 
 for arg in "$@"; do