Explorar o código

Merge pull request #32072 from coolljt0725/fix_log_dead

Fix docker logs a dead container
Brian Goff %!s(int64=8) %!d(string=hai) anos
pai
achega
9518a71cef
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      daemon/logs.go

+ 4 - 0
daemon/logs.go

@@ -29,6 +29,10 @@ func (daemon *Daemon) ContainerLogs(ctx context.Context, containerName string, c
 		return err
 	}
 
+	if container.RemovalInProgress || container.Dead {
+		return errors.New("can not get logs from container which is dead or marked for removal")
+	}
+
 	if container.HostConfig.LogConfig.Type == "none" {
 		return logger.ErrReadLogsNotSupported
 	}