better images cleanup

Author: maureeungaro

.github/workflows/cleanup.yml

@@ -22,7 +22,9 @@ permissions:
   packages: write  # needed for deletions with GITHUB_TOKEN
 
 env:
-  UNTAGGED_RETENTION_DAYS: 2
+  # Untagged versions are orphaned GHCR package versions left after tags move or manifests/caches are rewritten.
+  UNTAGGED_RETENTION_HOURS: 12
+  # Stale tagged versions still have tags, but those tags are no longer generated by the current image matrix.
   STALE_TAGGED_RETENTION_DAYS: 14
 
 jobs:
@@ -74,14 +76,14 @@ jobs:
           KEEP_TAGS: ${{ steps.keep-tags.outputs.json }}
           MANAGED_IMAGES: ${{ steps.keep-tags.outputs.images }}
           DRY_RUN: ${{ inputs.dry_run || 'false' }}
-          UNTAGGED_RETENTION_DAYS: ${{ env.UNTAGGED_RETENTION_DAYS }}
+          UNTAGGED_RETENTION_HOURS: ${{ env.UNTAGGED_RETENTION_HOURS }}
           STALE_TAGGED_RETENTION_DAYS: ${{ env.STALE_TAGGED_RETENTION_DAYS }}
         with:
           script: |
             const keepTags = new Set(JSON.parse(process.env.KEEP_TAGS));
             const managedImages = JSON.parse(process.env.MANAGED_IMAGES);
             const dryRun = process.env.DRY_RUN === 'true';
-            const untaggedRetentionMs = Number(process.env.UNTAGGED_RETENTION_DAYS) * 24 * 60 * 60 * 1000;
+            const untaggedRetentionMs = Number(process.env.UNTAGGED_RETENTION_HOURS) * 60 * 60 * 1000;
             const staleTaggedRetentionMs = Number(process.env.STALE_TAGGED_RETENTION_DAYS) * 24 * 60 * 60 * 1000;
             const now = Date.now();
 
@@ -118,13 +120,15 @@ jobs:
             let deleted = 0;
             for (const version of versions) {
               const tags = version.metadata?.container?.tags ?? [];
+              const createdAt = new Date(version.created_at).getTime();
               const updatedAt = new Date(version.updated_at).getTime();
-              const ageMs = now - updatedAt;
+              const ageMs = now - createdAt;
               const tagList = tags.length ? tags.join(', ') : '<untagged>';
+              const dates = `created ${version.created_at}, updated ${version.updated_at}`;
 
               let reason = null;
               if (tags.length === 0 && ageMs > untaggedRetentionMs) {
-                reason = `untagged older than ${process.env.UNTAGGED_RETENTION_DAYS} days`;
+                reason = `untagged older than ${process.env.UNTAGGED_RETENTION_HOURS} hours`;
               } else if (
                 tags.length > 0 &&
                 ageMs > staleTaggedRetentionMs &&
@@ -135,11 +139,11 @@ jobs:
               }
 
               if (!reason) {
-                core.info(`keep ${version.id}: ${tagList}`);
+                core.info(`keep ${version.id}: ${tagList} (${dates})`);
                 continue;
               }
 
-              core.info(`${dryRun ? 'would delete' : 'delete'} ${version.id}: ${tagList} (${reason})`);
+              core.info(`${dryRun ? 'would delete' : 'delete'} ${version.id}: ${tagList} (${reason}; ${dates})`);
               if (!dryRun) {
                 await deleteVersion({
                   ...ownerArgs,