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

builder: remove dependency on image

Browse Source 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9be1ec60d4d4fe63d5ef6e1ec36c585b548a00d0
Component: engine
This commit is contained in:
Tibor Vass
2015-12-16 17:01:36 +01:00
parent 0bf29d425d
commit 2723fcf0b2
6 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/builder/dockerfile/dispatchers.go
View File

@ -18,8 +18,8 @@ import (
"strings"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/builder"
derr "github.com/docker/docker/errors"
"github.com/docker/docker/image"
flag "github.com/docker/docker/pkg/mflag"
"github.com/docker/docker/pkg/nat"
"github.com/docker/docker/pkg/signal"
@ -210,7 +210,7 @@ func from(b *Builder, args []string, attributes map[string]bool, original string
}
var (
image *image.Image
image builder.Image
err error
)
// TODO: don't use `name`, instead resolve it to a digest

7
components/engine/builder/dockerfile/internals.go
View File

@ -24,7 +24,6 @@ import (
"github.com/docker/docker/builder"
"github.com/docker/docker/builder/dockerfile/parser"
"github.com/docker/docker/daemon"
"github.com/docker/docker/image"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/httputils"
"github.com/docker/docker/pkg/ioutils"
@ -403,11 +402,11 @@ func containsWildcards(name string) bool {
return false
}
func (b *Builder) processImageFrom(img *image.Image) error {
b.image = img.ID().String()
func (b *Builder) processImageFrom(img builder.Image) error {
b.image = img.ID()
if img.Config != nil {
b.runConfig = img.Config
b.runConfig = img.Config()
}
// The default path will be blank on Windows (set by HCS)