Skip to content

Commit

Permalink
Merge pull request moby#10196 from bobrik/unused-compression-arg
Browse files Browse the repository at this point in the history
Removed unused compression arg in Graph.TempLayerArchive()
  • Loading branch information
LK4D4 committed Jan 21, 2015
2 parents f72bcd3 + b682d7c commit fd6bd80
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion graph/graph.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (graph *Graph) Register(img *image.Image, layerData archive.ArchiveReader)
// The archive is stored on disk and will be automatically deleted as soon as has been read.
// If output is not nil, a human-readable progress bar will be written to it.
// FIXME: does this belong in Graph? How about MktempFile, let the caller use it for archives?
func (graph *Graph) TempLayerArchive(id string, compression archive.Compression, sf *utils.StreamFormatter, output io.Writer) (*archive.TempArchive, error) {
func (graph *Graph) TempLayerArchive(id string, sf *utils.StreamFormatter, output io.Writer) (*archive.TempArchive, error) {
image, err := graph.Get(id)
if err != nil {
return nil, err
Expand Down
3 changes: 1 addition & 2 deletions graph/push.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
log "github.com/Sirupsen/logrus"
"github.com/docker/docker/engine"
"github.com/docker/docker/image"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/registry"
"github.com/docker/docker/utils"
"github.com/docker/libtrust"
Expand Down Expand Up @@ -228,7 +227,7 @@ func (s *TagStore) pushImage(r *registry.Session, out io.Writer, imgID, ep strin
return "", err
}

layerData, err := s.graph.TempLayerArchive(imgID, archive.Uncompressed, sf, out)
layerData, err := s.graph.TempLayerArchive(imgID, sf, out)
if err != nil {
return "", fmt.Errorf("Failed to generate layer archive: %s", err)
}
Expand Down

0 comments on commit fd6bd80

Please sign in to comment.