From 2acf76e4655bbc4dacde42968e3b0f8b060d011d Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Thu, 16 Mar 2023 11:29:33 +0100 Subject: [PATCH] Fix 'blind_update' regression --- internal/dis/component/stack.go | 4 ++-- internal/wisski/ingredient/barrel/drush/update.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/dis/component/stack.go b/internal/dis/component/stack.go index f3b45d3..c6bc0b1 100644 --- a/internal/dis/component/stack.go +++ b/internal/dis/component/stack.go @@ -77,8 +77,8 @@ func (ds Stack) Up(ctx context.Context, progress io.Writer) error { // It returns the exit code of the process. func (ds Stack) Exec(ctx context.Context, io stream.IOStream, service, executable string, args ...string) func() int { compose := []string{"exec"} - if io.StdinIsATerminal() { - compose = append(compose, "-ti") + if !io.StdinIsATerminal() { + compose = append(compose, "-T") } compose = append(compose, service) diff --git a/internal/wisski/ingredient/barrel/drush/update.go b/internal/wisski/ingredient/barrel/drush/update.go index 20b5c2b..fdd1b53 100644 --- a/internal/wisski/ingredient/barrel/drush/update.go +++ b/internal/wisski/ingredient/barrel/drush/update.go @@ -14,7 +14,7 @@ import ( ) var errBlindUpdateFailed = exit.Error{ - Message: "failed to run blind update script for instance %q: exited with code %s", + Message: "failed to run blind update script for instance %q: exited with code %d", ExitCode: exit.ExitGeneric, }