source/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-02-09 01:59:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Does not start keyboard manager if there is no tty

Browse Source 
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
This commit is contained in:
Joana Hrotko
2024-03-28 15:02:00 +00:00
committed by Joana H
parent 339b331a86
commit ff20b641c7
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/compose/up.go
View File

@@ -79,6 +79,16 @@ func (opts upOptions) apply(project *types.Project, services []string) (*types.P
return project, nil
}
func (opts *upOptions) validateNavigationMenu(dockerCli command.Cli, experimentals *experimental.State) {
if !dockerCli.Out().IsTerminal() {
opts.navigationMenu = false
return
}
if !opts.navigationMenuChanged {
opts.navigationMenu = SetUnchangedOption(ComposeMenu, experimentals.NavBar())
}
}
func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service, experiments *experimental.State) *cobra.Command {
up := upOptions{}
create := createOptions{}
@@ -100,7 +110,10 @@ func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service, ex
if len(up.attach) != 0 && up.attachDependencies {
return errors.New("cannot combine --attach and --attach-dependencies")
}
return runUp(ctx, dockerCli, backend, experiments, create, up, build, project, services)
up.validateNavigationMenu(dockerCli, experiments)
return runUp(ctx, dockerCli, backend, create, up, build, project, services)
}),
ValidArgsFunction: completeServiceNames(dockerCli, p),
}
@@ -170,7 +183,6 @@ func runUp(
ctx context.Context,
dockerCli command.Cli,
backend api.Service,
experimentals *experimental.State,
createOptions createOptions,
upOptions upOptions,
buildOptions buildOptions,
@@ -190,9 +202,6 @@ func runUp(
if err != nil {
return err
}
if !upOptions.navigationMenuChanged {
upOptions.navigationMenu = SetUnchangedOption(ComposeMenu, experimentals.NavBar())
}
var build *api.BuildOptions
if !createOptions.noBuild {

7
cmd/formatter/shortcut.go
View File

@@ -275,10 +275,6 @@ func (lk *LogKeyboard) StartWatch(ctx context.Context, project *types.Project, o
}
}
func (lk *LogKeyboard) KeyboardClose() {
_ = keyboard.Close()
}
func (lk *LogKeyboard) HandleKeyEvents(event keyboard.KeyEvent, ctx context.Context, project *types.Project, options api.UpOptions) {
switch kRune := event.Rune; kRune {
case 'v':
@@ -288,8 +284,7 @@ func (lk *LogKeyboard) HandleKeyEvents(event keyboard.KeyEvent, ctx context.Cont
}
switch key := event.Key; key {
case keyboard.KeyCtrlC:
lk.KeyboardClose()
_ = keyboard.Close()
lk.clearNavigationMenu()
ShowCursor()