InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configure network endpoints after creating a container

Browse Source 
For Linux, delay construction and configuration of network endpoints
until the container has been created (but not started).

Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2024-02-24 00:51:18 +00:00
parent 788db583b1
commit fe856b94b5
4 changed files with 117 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
daemon/start.go
View File

@@ -124,9 +124,20 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
return err
}
if err := daemon.initializeNetworking(ctx, &daemonCfg.Config, container); err != nil {
newSandbox, err := daemon.initializeNetworking(ctx, &daemonCfg.Config, container)
if err != nil {
return err
}
defer func() {
if retErr != nil && newSandbox != nil {
if err := newSandbox.Delete(ctx); err != nil {
log.G(ctx).WithFields(log.Fields{
"error": err,
"container": container.ID,
}).Warn("After failure in networking initialisation, failed to remove sandbox")
}
}
}()
mnts, err := daemon.setupContainerDirs(container)
if err != nil {
@@ -221,7 +232,7 @@ func (daemon *Daemon) containerStart(ctx context.Context, daemonCfg *configStore
}
}()
if err := daemon.initializeCreatedTask(ctx, tsk, container, spec); err != nil {
if err := daemon.initializeCreatedTask(ctx, &daemonCfg.Config, tsk, container, spec); err != nil {
return err
}