зеркало из https://github.com/microsoft/docker.git
fix for iptables cleanup 8307
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
Родитель
d98b117962
Коммит
e171eda998
|
@ -527,7 +527,9 @@ func (container *Container) ReleaseNetwork() {
|
|||
}
|
||||
eng := container.daemon.eng
|
||||
|
||||
eng.Job("release_interface", container.ID).Run()
|
||||
job := eng.Job("release_interface", container.ID)
|
||||
job.SetenvBool("overrideShutdown", true)
|
||||
job.Run()
|
||||
container.NetworkSettings = &NetworkSettings{}
|
||||
}
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ const (
|
|||
// If the job returns a failure status, an error is returned
|
||||
// which includes the status.
|
||||
func (job *Job) Run() error {
|
||||
if job.Eng.IsShutdown() {
|
||||
if job.Eng.IsShutdown() && !job.GetenvBool("overrideShutdown") {
|
||||
return fmt.Errorf("engine is shutdown")
|
||||
}
|
||||
// FIXME: this is a temporary workaround to avoid Engine.Shutdown
|
||||
|
|
Загрузка…
Ссылка в новой задаче