toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

fix: -T/--tty disables TTY remote request
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
See #499
This commit is contained in:
decentral1se 2025-04-24 10:30:45 +02:00 committed by decentral1se
parent 83af39771b
commit 1432f480c7
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cli/app/cmd.go
View File

@ -183,7 +183,7 @@ does not).`,
if err := internal.RunCmdRemote( if err := internal.RunCmdRemote(
cl, cl,
app, app,
requestTTY, disableTTY,
app.Recipe.AbraShPath, app.Recipe.AbraShPath,
targetServiceName, cmdName, parsedCmdArgs, remoteUser); err != nil { targetServiceName, cmdName, parsedCmdArgs, remoteUser); err != nil {
log.Fatal(err) log.Fatal(err)
@ -238,7 +238,7 @@ func parseCmdArgs(args []string, isLocal bool) (bool, string) {
var ( var (
local bool local bool
remoteUser string remoteUser string
requestTTY bool disableTTY bool
) )
func init() { func init() {
@ -259,11 +259,11 @@ func init() {
) )
AppCmdCommand.Flags().BoolVarP( AppCmdCommand.Flags().BoolVarP(
&requestTTY, &disableTTY,
"tty", "tty",
"T", "T",
false, false,
"request remote TTY", "disable remote TTY",
) )
AppCmdCommand.Flags().BoolVarP( AppCmdCommand.Flags().BoolVarP(

8
cli/internal/command.go
View File

@ -24,7 +24,7 @@ import (
func RunCmdRemote( func RunCmdRemote(
cl *dockerClient.Client, cl *dockerClient.Client,
app appPkg.App, app appPkg.App,
requestTTY bool, disableTTY bool,
abraSh, serviceName, cmdName, cmdArgs, remoteUser string) error { abraSh, serviceName, cmdName, cmdArgs, remoteUser string) error {
filters := filters.NewArgs() filters := filters.NewArgs()
filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName)) filters.Add("name", fmt.Sprintf("^%s_%s", app.StackName(), serviceName))
@ -84,8 +84,10 @@ func RunCmdRemote(
} }
execCreateOpts.Cmd = cmd execCreateOpts.Cmd = cmd
execCreateOpts.Tty = requestTTY
if !requestTTY { execCreateOpts.Tty = true
if disableTTY {
execCreateOpts.Tty = false
log.Debugf("not requesting a remote TTY") log.Debugf("not requesting a remote TTY")
} }