From a00fca972da150e1c4562ce6cc89f8f1542f140d Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 11 Apr 2017 13:58:29 -0400 Subject: [PATCH] Remove unused id field from Builder. Signed-off-by: Daniel Nephin Upstream-commit: a6abd57b83dc0aaf0cedeeb488c8a41262e46b7d Component: engine --- components/engine/api/types/backend/backend.go | 3 +-- components/engine/builder/dockerfile/builder.go | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/components/engine/api/types/backend/backend.go b/components/engine/api/types/backend/backend.go index 83efae300b..de7e24f208 100644 --- a/components/engine/api/types/backend/backend.go +++ b/components/engine/api/types/backend/backend.go @@ -100,8 +100,7 @@ type ContainerCommitConfig struct { Changes []string } -// ProgressWriter is an interface -// to transport progress streams. +// ProgressWriter is a data object to transport progress streams to the client type ProgressWriter struct { Output io.Writer StdoutFormatter *streamformatter.StdoutFormatter diff --git a/components/engine/builder/dockerfile/builder.go b/components/engine/builder/dockerfile/builder.go index d655fff7fb..76e0dcf998 100644 --- a/components/engine/builder/dockerfile/builder.go +++ b/components/engine/builder/dockerfile/builder.go @@ -65,9 +65,6 @@ type Builder struct { buildArgs *buildArgs directive parser.Directive - // TODO: remove once docker.Commit can receive a tag - id string - imageCache builder.ImageCache from builder.Image } @@ -127,7 +124,6 @@ func NewBuilder(clientCtx context.Context, config *types.ImageBuildOptions, back context: buildContext, runConfig: new(container.Config), tmpContainers: map[string]struct{}{}, - id: stringid.GenerateNonCryptoID(), buildArgs: newBuildArgs(config.BuildArgs), directive: parser.Directive{ EscapeSeen: false,