mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #26118 from Microsoft/jjh/golintfixes
Fix golint errors in api
This commit is contained in:
commit
bf3d017f08
2 changed files with 2 additions and 2 deletions
|
@ -421,7 +421,7 @@ func replaceDockerfileTarWrapper(ctx context.Context, inputTarStream io.ReadClos
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var content io.Reader = tarReader
|
content := io.Reader(tarReader)
|
||||||
if hdr.Name == dockerfileName {
|
if hdr.Name == dockerfileName {
|
||||||
// This entry is the Dockerfile. Since the tar archive was
|
// This entry is the Dockerfile. Since the tar archive was
|
||||||
// generated from a directory on the local filesystem, the
|
// generated from a directory on the local filesystem, the
|
||||||
|
|
|
@ -163,7 +163,7 @@ func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *
|
||||||
return progress.NewProgressReader(in, progressOutput, r.ContentLength, "Downloading context", remoteURL)
|
return progress.NewProgressReader(in, progressOutput, r.ContentLength, "Downloading context", remoteURL)
|
||||||
}
|
}
|
||||||
|
|
||||||
var out io.Writer = output
|
out := io.Writer(output)
|
||||||
if buildOptions.SuppressOutput {
|
if buildOptions.SuppressOutput {
|
||||||
out = notVerboseBuffer
|
out = notVerboseBuffer
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue