From f160715c3f5862a88a3400f4e7a30f0098bd1770 Mon Sep 17 00:00:00 2001
From: AtomicFS <vojtech.vesely@9elements.com>
Date: Fri, 14 Mar 2025 15:18:11 +0100
Subject: [PATCH 1/2] fix(ci): update container cleanup workflow

- run weekly
- also keep discontinued containers clean

Signed-off-by: AtomicFS <vojtech.vesely@9elements.com>
---
 .github/workflows/container-cleanup.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/container-cleanup.yml b/.github/workflows/container-cleanup.yml
index e6e26271..77737146 100644
--- a/.github/workflows/container-cleanup.yml
+++ b/.github/workflows/container-cleanup.yml
@@ -2,7 +2,11 @@
 # Remove old containers
 
 name: container cleanup
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * 0'
+    # run weekly
 
 permissions:
   contents: read
@@ -35,6 +39,17 @@ jobs:
       fail-fast: false
       matrix:
         dockerfile: ${{ fromJson(needs.get-matrix.outputs.matrix) }}
+        # include discontinued containers
+        include:
+          - dockerfile: 'coreboot_4.20'
+          - dockerfile: 'coreboot_4.22'
+          - dockerfile: 'coreboot_24.02'
+          - dockerfile: 'edk2-stable202408'
+          - dockerfile: 'linux_6.1.111'
+          - dockerfile: 'linux_6.1.45'
+          - dockerfile: 'linux_6.6.52'
+          - dockerfile: 'linux_6.9.9'
+          - dockerfile: 'linux_6.11'
     permissions:
       contents: read
       packages: write
@@ -54,9 +69,8 @@ jobs:
         with:
           package-name: firmware-action/${{ matrix.dockerfile }}
           package-type: container
-          min-versions-to-keep: 5
-          ignore-versions:
-            '^(main|latest|v(\d+\.?)+)$'
+          min-versions-to-keep: 3
+          ignore-versions: '^(main|latest|v(\d+\.?)+)$'
             # ignore:
             # - main
             # - latest

From ff93c583380ed3d69a3d663c6fcebba2472731e1 Mon Sep 17 00:00:00 2001
From: AtomicFS <vojtech.vesely@9elements.com>
Date: Fri, 14 Mar 2025 15:54:35 +0100
Subject: [PATCH 2/2] docs: add note on discontinued container in
 docker-compose

Signed-off-by: AtomicFS <vojtech.vesely@9elements.com>
---
 docs/src/docker/docker-compose.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/src/docker/docker-compose.md b/docs/src/docker/docker-compose.md
index 4d0b7a7b..c169dcb3 100644
--- a/docs/src/docker/docker-compose.md
+++ b/docs/src/docker/docker-compose.md
@@ -91,3 +91,4 @@ In addition, there might be `VERIFICATION_TEST_*` variables. These are used insi
 
 - Update entry in list of containers in `README.md`
 - Add new regex entry into `Setup()` function in `cmd/firmware-action/container/container.go` to warn about discontinued containers
+- Add the discontinued container to `matrix` `include` in `.github/workflows/container-cleanup.yml` to keep even the discontinued containers tidy