DevFW-CICD/runner
16
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

chore: refactor NewDockerVolumeRemoveExecutor

Browse source 
- remove the force argument as it is always false
- accept more than one volume to be removed
This commit is contained in:
Earl Warren 2025-08-14 09:51:33 +02:00
parent 41f8b03b79
commit 96dc2d486e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
act/container/docker_volume.go
View file

@ -4,13 +4,14 @@ package container
import (
"context"
"slices"
"code.forgejo.org/forgejo/runner/v9/act/common"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/volume"
)
func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executor {
func NewDockerVolumesRemoveExecutor(volumeNames []string) common.Executor {
return func(ctx context.Context) error {
cli, err := GetDockerClient(ctx)
if err != nil {
@ -24,17 +25,18 @@ func NewDockerVolumeRemoveExecutor(volumeName string, force bool) common.Executo
}
for _, vol := range list.Volumes {
if vol.Name == volumeName {
return removeExecutor(volumeName, force)(ctx)
if slices.Contains(volumeNames, vol.Name) {
if err := removeExecutor(vol.Name)(ctx); err != nil {
return err
}
}
}
// Volume not found - do nothing
return nil
}
}
func removeExecutor(volume string, force bool) common.Executor {
func removeExecutor(volume string) common.Executor {
return func(ctx context.Context) error {
logger := common.Logger(ctx)
logger.Debugf("%sdocker volume rm %s", logPrefix, volume)
@ -49,6 +51,7 @@ func removeExecutor(volume string, force bool) common.Executor {
}
defer cli.Close()
force := false
return cli.VolumeRemove(ctx, volume, force)
}
}

3
act/runner/run_context.go
View file

@ -525,8 +525,7 @@ func (rc *RunContext) prepareJobContainer(ctx context.Context) error {
if rc.JobContainer != nil {
return rc.JobContainer.Remove().IfNot(reuseJobContainer).
Then(container.NewDockerVolumeRemoveExecutor(rc.jobContainerName(), false)).IfNot(reuseJobContainer).
Then(container.NewDockerVolumeRemoveExecutor(rc.jobContainerName()+"-env", false)).IfNot(reuseJobContainer).
Then(container.NewDockerVolumesRemoveExecutor([]string{rc.jobContainerName(), rc.jobContainerName() + "-env"})).IfNot(reuseJobContainer).
Then(func(ctx context.Context) error {
if len(rc.ServiceContainers) > 0 {
logger.Infof("Cleaning up services for job %s", rc.JobName)