github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-01 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify backend types (#5299)

Browse Source
This commit is contained in:
qwerty287
2025-07-05 12:59:17 +03:00
committed by GitHub
parent c97467ddcd
commit fe5ea7ad3b
10 changed files with 124 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pipeline/backend/docker/docker.go
View File

@@ -146,7 +146,7 @@ func (e *docker) SetupWorkflow(ctx context.Context, conf *backend.Config, taskUU
log.Trace().Str("taskUUID", taskUUID).Msg("create workflow environment")
_, err := e.client.VolumeCreate(ctx, volume.CreateOptions{
Name: conf.Volume.Name,
Name: conf.Volume,
Driver: volumeDriver,
})
if err != nil {
@@ -157,7 +157,7 @@ func (e *docker) SetupWorkflow(ctx context.Context, conf *backend.Config, taskUU
if e.info.OSType == "windows" {
networkDriver = networkDriverNAT
}
_, err = e.client.NetworkCreate(ctx, conf.Network.Name, network.CreateOptions{
_, err = e.client.NetworkCreate(ctx, conf.Network, network.CreateOptions{
Driver: networkDriver,
EnableIPv6: &e.config.enableIPv6,
})
@@ -324,11 +324,11 @@ func (e *docker) DestroyWorkflow(ctx context.Context, conf *backend.Config, task
}
}
}
if err := e.client.VolumeRemove(ctx, conf.Volume.Name, true); err != nil {
log.Error().Err(err).Msgf("could not remove volume '%s'", conf.Volume.Name)
if err := e.client.VolumeRemove(ctx, conf.Volume, true); err != nil {
log.Error().Err(err).Msgf("could not remove volume '%s'", conf.Volume)
}
if err := e.client.NetworkRemove(ctx, conf.Network.Name); err != nil {
log.Error().Err(err).Msgf("could not remove network '%s'", conf.Network.Name)
if err := e.client.NetworkRemove(ctx, conf.Network); err != nil {
log.Error().Err(err).Msgf("could not remove network '%s'", conf.Network)
}
return nil
}