From aa3083f577224ad74384f648b17c1474ab47b44f Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcgstyle.net>
Date: Tue, 31 Mar 2015 13:17:25 -0700
Subject: [PATCH] Fix progress reader output on close
Currently the progress reader won't close properly by not setting the close size.
fixes #11849
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
---
pkg/progressreader/progressreader.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkg/progressreader/progressreader.go b/pkg/progressreader/progressreader.go
index e548b07558..652831bff5 100644
--- a/pkg/progressreader/progressreader.go
+++ b/pkg/progressreader/progressreader.go
@@ -1,9 +1,10 @@
package progressreader
import (
+ "io"
+
"github.com/docker/docker/pkg/jsonmessage"
"github.com/docker/docker/pkg/streamformatter"
- "io"
)
// Reader with progress bar
@@ -43,6 +44,7 @@ func (config *Config) Read(p []byte) (n int, err error) {
return read, err
}
func (config *Config) Close() error {
+ config.Current = config.Size
config.Out.Write(config.Formatter.FormatProgress(config.ID, config.Action, &jsonmessage.JSONProgress{Current: config.Current, Total: config.Size}))
return config.In.Close()
}