toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/archive: remove unnecessary Archive and Reader type

Browse Source 
The `archive` package defines aliases for `io.ReadCloser` and
`io.Reader`. These don't seem to provide an benefit other than type
decoration. Per this change, several unnecessary type cases were
removed.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: aa2cc18745cbe0231c33782f0fa764f657e3fb88
Component: engine
This commit is contained in:
Stephen J Day
2016-10-20 16:40:59 -07:00
parent 2f7fc91dd4
commit fe1dce6a91
23 changed files with 75 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/builder/remote.go
View File

@ -89,7 +89,12 @@ func DetectContextFromRemoteURL(r io.ReadCloser, remoteURL string, createProgres
dockerfileName = DefaultDockerfileName
// TODO: return a context without tarsum
return archive.Generate(dockerfileName, string(dockerfile))
r, err := archive.Generate(dockerfileName, string(dockerfile))
if err != nil {
return nil, err
}
return ioutil.NopCloser(r), nil
},
// fallback handler (tar context)
"": func(rc io.ReadCloser) (io.ReadCloser, error) {

7
components/engine/builder/remote_test.go
View File

@ -172,7 +172,12 @@ func TestMakeRemoteContext(t *testing.T) {
if err != nil {
return nil, err
}
return archive.Generate(DefaultDockerfileName, string(dockerfile))
r, err := archive.Generate(DefaultDockerfileName, string(dockerfile))
if err != nil {
return nil, err
}
return ioutil.NopCloser(r), nil
},
})