Stop steps after they are done

.woodpecker/docker.yml

@@ -135,7 +135,6 @@ steps:
       repo: woodpeckerci/woodpecker-server
       dockerfile: docker/Dockerfile.server.multiarch
       platforms: *platforms_preview
-      logins: *publish_logins
       tag: pull_${CI_COMMIT_PULL_REQUEST}
     when:
       evaluate: 'not (CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images")'

pipeline/backend/docker/docker.go

@@ -291,6 +291,22 @@
 	return rc, nil
 }
 
+func (e *docker) DestroyStep(ctx context.Context, step *backend.Step, taskUUID string) error {
+	log.Trace().Str("taskUUID", taskUUID).Msgf("stop step %s", step.Name)
+
+	containerName := toContainerName(step)
+
+	if err := e.client.ContainerKill(ctx, containerName, "9"); err != nil && !isErrContainerNotFoundOrNotRunning(err) {
+		return err
+	}
+
+	if err := e.client.ContainerRemove(ctx, containerName, removeOpts); err != nil && !isErrContainerNotFoundOrNotRunning(err) {
+		return err
+	}
+
+	return nil
+}
+
 func (e *docker) DestroyWorkflow(_ context.Context, conf *backend.Config, taskUUID string) error {
 	log.Trace().Str("taskUUID", taskUUID).Msgf("delete workflow environment")
 

pipeline/backend/kubernetes/kubernetes.go

@@ -325,6 +325,29 @@
 	// return rc, nil
 }
 
+func (e *kube) DestroyStep(ctx context.Context, step *types.Step, taskUUID string) error {
+	podName, err := dnsName(step.Name)
+	if err != nil {
+		return err
+	}
+
+	log.Trace().Str("taskUUID", taskUUID).Msgf("Stopping pod: %s", podName)
+
+	gracePeriodSeconds := int64(0) // immediately
+	dpb := metav1.DeletePropagationBackground
+
+	deleteOpts := metav1.DeleteOptions{
+		GracePeriodSeconds: &gracePeriodSeconds,
+		PropagationPolicy:  &dpb,
+	}
+
+	if err := e.client.CoreV1().Pods(e.config.Namespace).Delete(ctx, podName, deleteOpts); err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+
+	return nil
+}
+
 // Destroy the pipeline environment.
 func (e *kube) DestroyWorkflow(_ context.Context, conf *types.Config, taskUUID string) error {
 	log.Trace().Str("taskUUID", taskUUID).Msg("Deleting Kubernetes primitives")
@@ -349,9 +372,7 @@
 			}
 			log.Trace().Msgf("Deleting pod: %s", stepName)
 			if err := e.client.CoreV1().Pods(e.config.Namespace).Delete(noContext, stepName, deleteOpts); err != nil {
-				if errors.IsNotFound(err) {
-					log.Trace().Err(err).Msgf("Unable to delete pod %s", stepName)
-				} else {
+				if !errors.IsNotFound(err) {
 					return err
 				}
 			}

pipeline/backend/local/local.go

@@ -132,14 +132,14 @@
 
 // execCommands use step.Image as shell and run the commands in it
 func (e *local) execCommands(ctx context.Context, step *types.Step, state *workflowState, env []string) error {
 	// Prepare commands
 	args, err := genCmdByShell(step.Image, step.Commands)
 	if err != nil {
 		return fmt.Errorf("could not convert commands into args: %w", err)
 	}
 
 	// Use "image name" as run command (indicate shell)
 	cmd := exec.CommandContext(ctx, step.Image, args...)
 	cmd.Env = env
 	cmd.Dir = state.workspaceDir
 
@@ -147,11 +147,11 @@
 	e.output, _ = cmd.StdoutPipe()
 	cmd.Stderr = cmd.Stdout
 
 	if runtime.GOOS == "windows" {
 		// we get non utf8 output from windows so just sanitize it
 		// TODO: remove hack
 		e.output = io.NopCloser(transform.NewReader(e.output, unicode.UTF8.NewDecoder().Transformer))
 	}
 
 	state.stepCMDs[step.Name] = cmd
 
@@ -215,6 +215,11 @@
 	return e.output, nil
 }
 
+func (e *local) DestroyStep(_ context.Context, _ *types.Step, _ string) error {
+	// WaitStep already waits for the command to finish, so there is nothing to do here.
+	return nil
+}
+
 // DestroyWorkflow the pipeline environment.
 func (e *local) DestroyWorkflow(_ context.Context, _ *types.Config, taskUUID string) error {
 	log.Trace().Str("taskUUID", taskUUID).Msgf("delete workflow environment")

pipeline/backend/types/engine.go

@@ -28,22 +28,25 @@ type Engine interface {
 	// IsAvailable check if the backend is available.
 	IsAvailable(ctx context.Context) bool
 
-	// Load the backend engine.
+	// Load loads the backend engine.
 	Load(ctx context.Context) error
 
-	// SetupWorkflow the workflow environment.
+	// SetupWorkflow sets up the workflow environment.
 	SetupWorkflow(ctx context.Context, conf *Config, taskUUID string) error
 
-	// StartStep start the workflow step.
+	// StartStep starts the workflow step.
 	StartStep(ctx context.Context, step *Step, taskUUID string) error
 
-	// WaitStep for the workflow step to complete and returns
+	// WaitStep waits for the workflow step to complete and returns
 	// the completion results.
 	WaitStep(ctx context.Context, step *Step, taskUUID string) (*State, error)
 
-	// TailStep the workflow step logs.
+	// TailStep tails the workflow step logs.
 	TailStep(ctx context.Context, step *Step, taskUUID string) (io.ReadCloser, error)
 
-	// DestroyWorkflow the workflow environment.
+	// DestroyStep destroys the workflow step.
+	DestroyStep(ctx context.Context, step *Step, taskUUID string) error
+
+	// DestroyWorkflow destroys the workflow environment.
 	DestroyWorkflow(ctx context.Context, conf *Config, taskUUID string) error
 }

pipeline/pipeline.go

@@ -274,6 +274,10 @@
 		return nil, err
 	}
 
+	if err := r.engine.DestroyStep(r.ctx, step, r.taskUUID); err != nil {
+		return nil, err
+	}
+
 	if waitState.OOMKilled {
 		return waitState, &OomError{
 			Name: step.Name,