forgejo/forgejo

Fork 842

fix: cleanup of multi-platform container images #11246

Merged

mfenniak merged 3 commits from wandhydrant/forgejo:fix-container-cleanup-multi-platform into forgejo

2026-02-12 03:12:35 +01:00

wandhydrant commented

2026-02-11 17:23:00 +01:00

Contributor

This change fixes an issue that makes Forgejo clean up too many versions of a container package even though it should keep them according to the rules set for the package.

The issue affects multi-platform container images.
Forgejo adds a package version for each platform (for example linux/amd64, linux/arm64) in addition to the actual tag (for example 0.6.0 or latest).

This results in rows in the table package_version similar to this (unimportant columns omitted for brevity):

lower_version	created_unix
`latest`	`1768742887`
`0.6.0`	`1768742886`
`sha256:038e...`	`1768742886`
`sha256:fc38...`	`1768742886`
`0.5.0`	`1768742864`
`sha256:806d...`	`1768742864`
`sha256:0a19...`	`1768742864`
`0.4.0`	`1768742848`
`...`	`...`

The code assumes that the first <keep count> entries can be ignored and considers every entry after <keep count> as eligible for cleanup.
That doesn't work for multi-platform container images because, for <keep count>=5, it considers version 0.4.0 as eligible.

Checklist

The contributor guide contains information that will be helpful to first time contributors. There also are a few conditions for merging Pull Requests in Forgejo repositories. You are also welcome to join the Forgejo development chatroom.

Tests

I added test coverage for Go changes...
- in their respective *_test.go for unit tests.
- in the tests/integration directory if it involves interactions with a live Forgejo server.
I added test coverage for JavaScript changes...
- in web_src/js/*.test.js if it can be unit tested.
- in tests/e2e/*.test.e2e.js if it requires interactions with a live Forgejo server (see also the developer guide for JavaScript testing).

Documentation

I created a pull request to the documentation to explain to Forgejo users how to use this change.
I did not document these changes and I do not expect someone else to do it.

Release notes

This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change.
This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change.

The decision if the pull request will be shown in the release notes is up to the mergers / release team.

The content of the release-notes/<pull request number>.md file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead.

Release notes

Bug fixes
- PR: cleanup of multi-platform container images

This change fixes an issue that makes Forgejo clean up too many versions of a container package even though it should keep them according to the rules set for the package. The issue affects multi-platform container images. Forgejo adds a package version for each platform (for example `linux/amd64`, `linux/arm64`) in addition to the actual tag (for example `0.6.0` or `latest`). This results in rows in the table `package_version` similar to this (unimportant columns omitted for brevity): | **lower_version** | **created_unix** | |---|---| | `latest` | `1768742887`| | `0.6.0` | `1768742886` | | `sha256:038e...` | `1768742886` | | `sha256:fc38...` | `1768742886` | | `0.5.0` | `1768742864` | | `sha256:806d...` | `1768742864` | | `sha256:0a19...` | `1768742864` | | `0.4.0` | `1768742848` | | `...` | `...` | The code assumes that the first `<keep count>` entries can be ignored and considers every entry after `<keep count>` as eligible for cleanup. That doesn't work for multi-platform container images because, for `<keep count>=5`, it considers version `0.4.0` as eligible. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [ ] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead.  ## Release notes  - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/11246): cleanup of multi-platform container images

wandhydrant added the

test

needed

label

2026-02-11 17:23:00 +01:00

wandhydrant added 2 commits

2026-02-11 17:23:01 +01:00

fix keep detection de64d3f508

Merge branch 'forgejo' into fix-container-cleanup-multi-platform

testing / semgrep/ci (pull_request) Successful in 18s

Details

issue-labels / backporting (pull_request_target) Has been skipped

Details

issue-labels / cascade (pull_request_target) Has been skipped

Details

testing / frontend-checks (pull_request) Successful in 1m11s

Details

requirements / merge-conditions (pull_request) Successful in 2s

Details

issue-labels / release-notes (pull_request_target) Successful in 46s

Details

testing / backend-checks (pull_request) Failing after 3m25s

Details

testing / test-unit (pull_request) Has been skipped

Details

testing / test-e2e (pull_request) Has been skipped

Details

testing / test-mysql (pull_request) Has been skipped

Details

testing / test-pgsql (pull_request) Has been skipped

Details

testing / test-sqlite (pull_request) Has been skipped

Details

testing / test-remote-cacher (redis) (pull_request) Has been cancelled

Details

testing / test-remote-cacher (valkey) (pull_request) Has been cancelled

Details

testing / test-remote-cacher (garnet) (pull_request) Has been cancelled

Details

testing / test-remote-cacher (redict) (pull_request) Has been cancelled

Details

testing / security-check (pull_request) Has been cancelled

Details

b7e0745e27

wandhydrant changed title from ~~fix-container-cleanup-multi-platform~~ to fix: cleanup of multi-platform container images

2026-02-11 17:23:25 +01:00

mfenniak added

and removed

labels

2026-02-11 17:45:42 +01:00

mfenniak commented

2026-02-11 17:46:40 +01:00

Member

This looks good to me! I noticed this problem when working on #10297 but didn't have the capacity at the time to fix it, so thanks for taking a look into this. I'll run CI on this and we should be able to get it resolved quickly. 🙂

viceice approved these changes

2026-02-11 17:50:39 +01:00

Dismissed

viceice left a comment

looks good.

partial regression of #9219 and #9468

looks good. - partial regression of #9219 and #9468

viceice added the

backport/v14.0/forgejo

worth a release-note

labels

2026-02-11 17:51:08 +01:00

forgejo-release-notes-assistant commented

2026-02-11 17:53:00 +01:00

Member

Where does that come from?

The following is a preview of the release notes for this pull request, as they will appear in the upcoming release. They are derived from the content of the `release-notes/11246.md` file, if it exists, or the title of the pull request. They were also added at the bottom of the description of this pull request for easier reference.

This message and the release notes originate from a call to the release-notes-assistant.

@@ -47,2 +47,10 @@
 
 The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead.
+
+<!--start release-notes-assistant-->
+
+## Release notes
+<!--URL:https://codeberg.org/forgejo/forgejo-->
+- Bug fixes
+  - [PR](https://codeberg.org/forgejo/forgejo/pulls/11246): <!--number 11246 --><!--line 0 --><!--description Y2xlYW51cCBvZiBtdWx0aS1wbGF0Zm9ybSBjb250YWluZXIgaW1hZ2Vz-->cleanup of multi-platform container images<!--description-->
+<!--end release-notes-assistant-->

Release notes

Bug fixes
- PR: cleanup of multi-platform container images

<details> <summary>Where does that come from?</summary> The following is a preview of the release notes for this pull request, as they will appear in the upcoming release. They are derived from the content of the `release-notes/11246.md` file, if it exists, or the title of the pull request. They were also added at the bottom of the description of this pull request for easier reference. This message and the release notes originate from a call to the [release-notes-assistant](https://code.forgejo.org/forgejo/release-notes-assistant). ```diff @@ -47,2 +47,10 @@ The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. + + + +## Release notes + +- Bug fixes + - [PR](https://codeberg.org/forgejo/forgejo/pulls/11246): cleanup of multi-platform container images + ``` </details>  ## Release notes  - Bug fixes - [PR](https://codeberg.org/forgejo/forgejo/pulls/11246): cleanup of multi-platform container images

mfenniak commented

2026-02-11 17:55:26 +01:00

Member

Needs a minor fmt fix: https://codeberg.org/forgejo/forgejo/actions/runs/137947/jobs/0/attempt/1

wandhydrant added 1 commit

2026-02-11 17:57:13 +01:00

apply format rules

issue-labels / release-notes (pull_request_target) Successful in 39s

Details

requirements / merge-conditions (pull_request) Successful in 1s

Details

testing / semgrep/ci (pull_request) Successful in 17s

Details

testing / frontend-checks (pull_request) Successful in 1m17s

Details

testing / backend-checks (pull_request) Successful in 3m50s

Details

testing / test-unit (pull_request) Successful in 8m30s

Details

testing / test-e2e (pull_request) Successful in 26m40s

Details

testing / test-mysql (pull_request) Successful in 28m27s

Details

testing / test-remote-cacher (redis) (pull_request) Successful in 2m12s

Details

testing / test-remote-cacher (valkey) (pull_request) Successful in 2m14s

Details

testing / test-sqlite (pull_request) Successful in 34m30s

Details

testing / test-remote-cacher (garnet) (pull_request) Successful in 2m22s

Details

testing / test-remote-cacher (redict) (pull_request) Successful in 2m29s

Details

testing / test-pgsql (pull_request) Successful in 39m41s

Details

testing / security-check (pull_request) Successful in 1m31s

Details

milestone / set (pull_request_target) Successful in 7s

Details

issue-labels / backporting (pull_request_target) Successful in 1m8s

Details

b9c213cabd

wandhydrant commented

2026-02-11 17:58:11 +01:00

Author

Contributor

@mfenniak wrote in #11246 (comment):

Needs a minor fmt fix: https://codeberg.org/forgejo/forgejo/actions/runs/137947/jobs/0/attempt/1

Applied in b9c213cabd.

@mfenniak wrote in https://codeberg.org/forgejo/forgejo/pulls/11246#issuecomment-10526382: > Needs a minor fmt fix: https://codeberg.org/forgejo/forgejo/actions/runs/137947/jobs/0/attempt/1 Applied in b9c213cabdbfabdd9e8dcd73f8f4a9eb730d3acf.

viceice approved these changes

2026-02-11 18:20:39 +01:00

mfenniak approved these changes

2026-02-12 03:12:20 +01:00

mfenniak merged commit 9ea9582c9b into forgejo

2026-02-12 03:12:35 +01:00

mfenniak referenced this pull request from a commit

2026-02-12 03:12:45 +01:00

fix: cleanup of multi-platform container images (#11246)

forgejo-release-notes-assistant added this to the Forgejo v15.0.0 milestone

2026-02-12 03:12:46 +01:00