Skip to content

[1.4] assorted small backports#5110

Merged
AkihiroSuda merged 9 commits intoopencontainers:release-1.4from
kolyshkin:1.4-backports
Feb 11, 2026
Merged

[1.4] assorted small backports#5110
AkihiroSuda merged 9 commits intoopencontainers:release-1.4from
kolyshkin:1.4-backports

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Feb 10, 2026

This is a backport of the following small PRs from the main branch:

To ease the future backporting:

To deprecate the "leaked" IDs we shouldn't have exported:

To ensure we build with a supported Docker version:

The last one also fixes a CI failure (a check added in #5000).

ariel-anieli and others added 2 commits February 10, 2026 13:50
The commit mentioned below has missed these changes.

Fixes: 1757062 ("Use for range over integers")
Signed-off-by: Ariel Otilibili <otilibil@eurecom.fr>
(cherry picked from commit 34da991)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Commit b2f8a74 "clothed" the naked return as inflicted by gofumpt
v0.9.0. Since gofumpt v0.9.2 this rule was moved to "extra" category,
not enabled by default. The only other "extra" rule is to group adjacent
parameters with the same type, which also makes sense.

Enable gofumpt "extra" rules, and reformat the code accordingly.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 67840cc)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin added this to the 1.4.1 milestone Feb 10, 2026
@kolyshkin kolyshkin added the backport/1.4-pr A backport PR to release-1.4 label Feb 10, 2026
@kolyshkin kolyshkin changed the base branch from main to release-1.4 February 10, 2026 21:56
@kolyshkin
Copy link
Copy Markdown
Contributor Author

close/reopen to fix CI

@kolyshkin kolyshkin closed this Feb 10, 2026
@kolyshkin kolyshkin reopened this Feb 10, 2026
dependabot bot and others added 7 commits February 10, 2026 14:06
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.37.0 to 0.38.0.
- [Commits](golang/sys@v0.37.0...v0.38.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-version: 0.38.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 071beab)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This is mostly a mechanical change, but we also need to change some
types to match the "mode int" argument that golang.org/x/sys/unix
decided to use.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
(cherry picked from commit a0e809a)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Alas, these new constants are already in v1.4.0 release so we can't
remove those right away, but we can mark them as deprecated now
and target removal for v1.5.0.

So,
 - mark them as deprecated;
 - redefine via unix.MPOL_* counterparts;
 - fix the validator code to use unix.MPOL_* directly.

This amends commit a0e809a.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 3741f91)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This which is already using in CI on Fedora.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f128234)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This version was released almost a year ago.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f4710e5)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(as well as for testing on Cirrus CI)

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 79b97d4)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 68771cf)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
Copy link
Copy Markdown
Contributor Author

@opencontainers/runc-maintainers can we please fast track this, so I can backport #5091 (and #5098)?

@AkihiroSuda AkihiroSuda merged commit e430416 into opencontainers:release-1.4 Feb 11, 2026
37 checks passed
@lifubang
Copy link
Copy Markdown
Member

@opencontainers/runc-maintainers can we please fast track this, so I can backport #5091 (and #5098)?

done

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/ci backport/1.4-pr A backport PR to release-1.4

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants