[v14.0/forgejo] fix: cleanup of multi-platform container images #11254

Merged

mfenniak merged 1 commit from bp-v14.0/forgejo-9ea9582 into v14.0/forgejo

2026-02-23 18:49:28 +01:00

forgejo-backport-action commented

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

Member

Backport: #11246

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

**Backport:** https://codeberg.org/forgejo/forgejo/pulls/11246 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

Rows
Columns