ci: Remove docker containers at end, systematically

Author: FabioLuporini

.github/actions/docker-clean/action.yaml

@@ -1,5 +1,5 @@
 name: Docker cleanup action
-description: Composite action for removing Docker images
+description: Composite action for removing Docker containers and images
 author: "Devito"
 
 inputs:
@@ -10,12 +10,22 @@ inputs:
   tag:
     description: "Tag of the built image to use"
     required: true
+  name:
+    description: "Name substring used by the docker-run action"
+    default: ""
 
 runs:
   using: "composite"
   steps:
     - id: dockerclean
-      name: "Cleanup docker image"
+      name: "Cleanup Docker resources"
       shell: bash
+      env:
+        NAME: ${{ inputs.name }}
+        TAG: ${{ inputs.tag }}
+        UNIQUE: ${{ inputs.uid }}
       run: |
-          docker image rm -f "${{ inputs.tag }}_${{ inputs.uid }}"
+        CONTAINER_NAME="ci-${NAME:-${TAG}}-${UNIQUE}"
+
+        docker container rm -f "${CONTAINER_NAME}" 2>/dev/null || true
+        docker image rm -f "${TAG}_${UNIQUE}"

.github/actions/readme.md

@@ -87,20 +87,23 @@ Inputs:
 
 - `uid`: Unique identifier output from docker-build action
 - `tag`: Tag of the built image to use
+- `name`: Name substring passed to docker-run (optional)
 
 ### Notes
 
 - UID must be unique, easily obtained from build action
 - Tag must match built image, easily obtained from build action
-- Use `if: always()` to always clean up the image, even if the workflow fails
+- If set, name must match the optional name passed to docker-run
+- Use `if: always()` to clean up the container and image even if the workflow
+  fails
 
 Example:
 
 ```yaml
 jobs:
   test:
     steps:
-    - name: Cleanup Docker image
+    - name: Cleanup Docker resources
       if: always()
       uses: ./.github/actions/docker-clean
       with: