Remove engine.Job from builder.CmdBuildConfig.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ae4063585e7936780154101f7fe416a080c6ff7c
Component: engine
This commit is contained in:
David Calavera
2015-04-16 14:26:33 -07:00
parent a618f11507
commit 16569396d9
7 changed files with 196 additions and 202 deletions

View File

@ -11,7 +11,6 @@ import (
"github.com/Sirupsen/logrus"
apiserver "github.com/docker/docker/api/server"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/builder"
"github.com/docker/docker/daemon"
_ "github.com/docker/docker/daemon/execdriver/lxc"
_ "github.com/docker/docker/daemon/execdriver/native"
@ -141,9 +140,6 @@ func mainDaemon() {
"graphdriver": d.GraphDriver().String(),
}).Info("Docker daemon")
b := &builder.BuilderJob{eng, d}
b.Install()
// after the daemon is done setting up we can tell the api to start
// accepting connections with specified daemon
api.AcceptConnections(d)
@ -155,7 +151,6 @@ func mainDaemon() {
if errAPI != nil {
logrus.Fatalf("Shutting down due to ServeAPI error: %v", errAPI)
}
}
// currentUserIsOwner checks whether the current user is the owner of the given