From 75a4cd19f2b455cd5eec0764ed5e62abb41cfbb5 Mon Sep 17 00:00:00 2001 From: John Howard Date: Mon, 29 Aug 2016 13:36:16 -0700 Subject: [PATCH] Fix golint errors in api Signed-off-by: John Howard Upstream-commit: c8ce0856b752cecb2f2a2149b79e6e96a63f03dc Component: engine --- components/engine/api/client/image/build.go | 2 +- components/engine/api/server/router/build/build_routes.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/api/client/image/build.go b/components/engine/api/client/image/build.go index e3d3f034fc..b1a227c099 100644 --- a/components/engine/api/client/image/build.go +++ b/components/engine/api/client/image/build.go @@ -421,7 +421,7 @@ func replaceDockerfileTarWrapper(ctx context.Context, inputTarStream io.ReadClos return } - var content io.Reader = tarReader + content := io.Reader(tarReader) if hdr.Name == dockerfileName { // This entry is the Dockerfile. Since the tar archive was // generated from a directory on the local filesystem, the diff --git a/components/engine/api/server/router/build/build_routes.go b/components/engine/api/server/router/build/build_routes.go index b5a7c28b69..7c95087be1 100644 --- a/components/engine/api/server/router/build/build_routes.go +++ b/components/engine/api/server/router/build/build_routes.go @@ -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) } - var out io.Writer = output + out := io.Writer(output) if buildOptions.SuppressOutput { out = notVerboseBuffer }