a9c6169138
pkg/chrootarchive/diff_unix.go erroneously calls flush on stdout, which tries to read from stdout returning an error. This has been fixed by removing the call and by modifying flush to return errors and checking for these errors on calls to flush. Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
28 lines
462 B
Go
28 lines
462 B
Go
// +build !windows
|
|
|
|
package chrootarchive
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
|
|
"github.com/docker/docker/pkg/reexec"
|
|
)
|
|
|
|
func init() {
|
|
reexec.Register("docker-applyLayer", applyLayer)
|
|
reexec.Register("docker-untar", untar)
|
|
}
|
|
|
|
func fatal(err error) {
|
|
fmt.Fprint(os.Stderr, err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// flush consumes all the bytes from the reader discarding
|
|
// any errors
|
|
func flush(r io.Reader) (bytes int64, err error) {
|
|
return io.Copy(ioutil.Discard, r)
|
|
}
|