Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
| ... | ... |
@@ -1109,7 +1109,7 @@ func (container *Container) allocateNetwork() error {
|
| 1109 | 1109 |
|
| 1110 | 1110 |
var ( |
| 1111 | 1111 |
env *engine.Env |
| 1112 |
- eng = container.runtime.srv.Eng |
|
| 1112 |
+ eng = container.runtime.eng |
|
| 1113 | 1113 |
) |
| 1114 | 1114 |
if container.State.IsGhost() {
|
| 1115 | 1115 |
if container.runtime.config.DisableNetwork {
|
| ... | ... |
@@ -1220,7 +1220,7 @@ func (container *Container) releaseNetwork() {
|
| 1220 | 1220 |
if container.Config.NetworkDisabled {
|
| 1221 | 1221 |
return |
| 1222 | 1222 |
} |
| 1223 |
- eng := container.runtime.srv.Eng |
|
| 1223 |
+ eng := container.runtime.eng |
|
| 1224 | 1224 |
|
| 1225 | 1225 |
eng.Job("release_interface", container.ID).Run()
|
| 1226 | 1226 |
container.NetworkSettings = &NetworkSettings{}
|
| ... | ... |
@@ -34,7 +34,13 @@ func mkRuntime(f utils.Fataler) *docker.Runtime {
|
| 34 | 34 |
AutoRestart: false, |
| 35 | 35 |
Mtu: docker.DefaultNetworkMtu, |
| 36 | 36 |
} |
| 37 |
- r, err := docker.NewRuntimeFromDirectory(config) |
|
| 37 |
+ |
|
| 38 |
+ eng, err := engine.New(root) |
|
| 39 |
+ if err != nil {
|
|
| 40 |
+ f.Fatal(err) |
|
| 41 |
+ } |
|
| 42 |
+ |
|
| 43 |
+ r, err := docker.NewRuntimeFromDirectory(config, eng) |
|
| 38 | 44 |
if err != nil {
|
| 39 | 45 |
f.Fatal(err) |
| 40 | 46 |
} |
| ... | ... |
@@ -50,6 +50,7 @@ type Runtime struct {
|
| 50 | 50 |
sysInfo *sysinfo.SysInfo |
| 51 | 51 |
volumes *Graph |
| 52 | 52 |
srv *Server |
| 53 |
+ eng *engine.Engine |
|
| 53 | 54 |
config *DaemonConfig |
| 54 | 55 |
containerGraph *graphdb.Database |
| 55 | 56 |
driver graphdriver.Driver |
| ... | ... |
@@ -740,6 +741,7 @@ func NewRuntimeFromDirectory(config *DaemonConfig, eng *engine.Engine) (*Runtime |
| 740 | 740 |
driver: driver, |
| 741 | 741 |
sysInitPath: sysInitPath, |
| 742 | 742 |
execDriver: ed, |
| 743 |
+ eng: eng, |
|
| 743 | 744 |
} |
| 744 | 745 |
|
| 745 | 746 |
if err := runtime.restore(); err != nil {
|