Merge pull request #8777 from yankay/fix-restart-with-tty

Fix the automatically restart issue when using LogURI and Terminal together
This commit is contained in:
Phil Estes
2023-07-06 10:51:11 -04:00
committed by GitHub
2 changed files with 24 additions and 2 deletions

View File

@@ -44,13 +44,21 @@ type startChange struct {
func (s *startChange) apply(ctx context.Context, client *containerd.Client) error {
log := cio.NullIO
spec, err := s.container.Spec(ctx)
if err != nil {
return err
}
useTTY := spec.Process.Terminal
if s.logURI != "" {
uri, err := url.Parse(s.logURI)
if err != nil {
return fmt.Errorf("failed to parse %v into url: %w", s.logURI, err)
}
log = cio.LogURI(uri)
if useTTY {
log = cio.TerminalLogURI(uri)
} else {
log = cio.LogURI(uri)
}
}
if s.count > 0 {