[pull] main from containerd:main - #307
Open
pull[bot] wants to merge 1361 commits into
Open
Conversation
When running in rootless mode, nerdctl version now includes the RootlessKit version as a server component, matching the format used by docker version. The version is retrieved via the RootlessKit API socket (rootlessutil.NewRootlessKitClient + Info(ctx)) rather than shelling out to rootlesskit --version, which is more robust and avoids PATH issues. The version is only shown when rootless mode is active (i.e. when rootlessutil.IsRootless() is true). If the API socket is unavailable or the Info call fails, a warning is logged and the component is shown without a version string. Fixes #4936 Signed-off-by: Aaron Mark <64331623+amarkdotdev@users.noreply.github.com>
feat: show RootlessKit version in nerdctl version output
Previously `nerdctl run` rejected -i with -d unconditionally via a FIXME error. The combination is valid when -t is also given: the containerd shim holds the pty open, so the detached container keeps a usable stdin. Without -t, a detached interactive container cannot work in nerdctl's daemonless model -- there is no persistent process to hold the container's stdin open, so the process would read EOF immediately. That case now returns a clear error instead of the FIXME. Add integration tests for the accepted (-t -d -i) and rejected (-d -i) cases. Signed-off-by: Mayur Das <mayur.das@neevcloud.com>
Docker's `--mount` has no `rw` option (only `readonly`/`ro`), and in nerdctl `rw` was redundant (read-write is the default) while `rw=false` was silently ignored, leaving the mount writable. Remove `rw` from the `--mount` parser so `rw`/`rw=false` return an error, matching Docker. `ro`/`readonly`/`rro` are unchanged, and the `-v src:dst:rw` syntax is unaffected (different parser). Also fix the docs: `readonly`/`ro` are Docker-compatible, `rro` is nerdctl-specific (recursive read-only). Signed-off-by: Mayur Das <mayur.das@neevcloud.com>
Signed-off-by: immanuwell <pchpr.00@list.ru>
Bumps [zizmorcore/zizmor-action](https://github.com/zizmorcore/zizmor-action) from 0.5.6 to 0.5.7. - [Release notes](https://github.com/zizmorcore/zizmor-action/releases) - [Commits](zizmorcore/zizmor-action@5f14fd0...192e21d) --- updated-dependencies: - dependency-name: zizmorcore/zizmor-action dependency-version: 0.5.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/compose-spec/compose-go/v2](https://github.com/compose-spec/compose-go) from 2.11.0 to 2.12.1. - [Release notes](https://github.com/compose-spec/compose-go/releases) - [Commits](compose-spec/compose-go@v2.11.0...v2.12.1) --- updated-dependencies: - dependency-name: github.com/compose-spec/compose-go/v2 dependency-version: 2.12.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) from 2.4.0 to 2.4.1. - [Release notes](https://github.com/pelletier/go-toml/releases) - [Commits](pelletier/go-toml@v2.4.0...v2.4.1) --- updated-dependencies: - dependency-name: github.com/pelletier/go-toml/v2 dependency-version: 2.4.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/cache](https://github.com/actions/cache) from 5.0.5 to 6.0.0. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@27d5ce7...2c8a9bd) --- updated-dependencies: - dependency-name: actions/cache dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
…tions/cache-6.0.0 build(deps): bump actions/cache from 5.0.5 to 6.0.0
…zmorcore/zizmor-action-0.5.7 build(deps): bump zizmorcore/zizmor-action from 0.5.6 to 0.5.7
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
….com/compose-spec/compose-go/v2-2.12.1 build(deps): bump github.com/compose-spec/compose-go/v2 from 2.11.0 to 2.12.1
….com/pelletier/go-toml/v2-2.4.1 build(deps): bump github.com/pelletier/go-toml/v2 from 2.4.0 to 2.4.1
feat(run): allow -i and -d together when -t is set
fix(mount): remove the non-Docker `rw` option from --mount
Bumps [github.com/Microsoft/hcsshim](https://github.com/Microsoft/hcsshim) from 0.15.0-rc.1 to 0.15.0-rc.2. - [Release notes](https://github.com/Microsoft/hcsshim/releases) - [Commits](microsoft/hcsshim@v0.15.0-rc.1...v0.15.0-rc.2) --- updated-dependencies: - dependency-name: github.com/Microsoft/hcsshim dependency-version: 0.15.0-rc.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@4a36011...924ae3a) --- updated-dependencies: - dependency-name: actions/setup-go dependency-version: 6.5.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/pelletier/go-toml/v2](https://github.com/pelletier/go-toml) from 2.4.1 to 2.4.2. - [Release notes](https://github.com/pelletier/go-toml/releases) - [Commits](pelletier/go-toml@v2.4.1...v2.4.2) --- updated-dependencies: - dependency-name: github.com/pelletier/go-toml/v2 dependency-version: 2.4.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
….com/Microsoft/hcsshim-0.15.0-rc.2 build(deps): bump github.com/Microsoft/hcsshim from 0.15.0-rc.1 to 0.15.0-rc.2
…tions/setup-go-6.5.0 build(deps): bump actions/setup-go from 6.4.0 to 6.5.0
update runc (1.5.0), BuildKit (0.31.1)
TestRunQuiet force-removes the shared CommonImage (== AlpineImage) in its setup and cleanup to exercise a fresh pull, but it ran in parallel. The containerd content store is global across namespaces, so that rmi GCs the Alpine layer blobs out from under concurrent tests mid-run, which then fail with "content digest <sha> not found" (observed in TestRunUmask). Mark TestRunQuiet NoParallel so it no longer races other tests using the shared image, instead of pulling the image in each consumer's setup. Signed-off-by: Mayur Das <mayur.das@neevcloud.com>
fix: skip rootless reexec for help-only command paths
….com/pelletier/go-toml/v2-2.4.2 build(deps): bump github.com/pelletier/go-toml/v2 from 2.4.1 to 2.4.2
…etup test: de-parallelize TestRunQuiet so it stops GC'ing the shared image
Bumps the moby-sys group with 1 update: [github.com/moby/sys/user](https://github.com/moby/sys). Updates `github.com/moby/sys/user` from 0.4.0 to 0.4.1 - [Release notes](https://github.com/moby/sys/releases) - [Commits](moby/sys@user/v0.4.0...user/v0.4.1) --- updated-dependencies: - dependency-name: github.com/moby/sys/user dependency-version: 0.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: moby-sys ... Signed-off-by: dependabot[bot] <support@github.com>
…ys-78bcc5e392 build(deps): bump github.com/moby/sys/user from 0.4.0 to 0.4.1 in the moby-sys group
…-cosign-nerdtest refactor: migrate compose cosign verify test to nerdtest
Bumps [github.com/cilium/ebpf](https://github.com/cilium/ebpf) from 0.17.3 to 0.22.0. - [Commits](cilium/ebpf@v0.17.3...v0.22.0) --- updated-dependencies: - dependency-name: github.com/cilium/ebpf dependency-version: 0.22.0 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
….com/klauspost/compress-1.19.2 build(deps): bump github.com/klauspost/compress from 1.19.1 to 1.19.2
…tions/attest-build-provenance-4.2.2 build(deps): bump actions/attest-build-provenance from 4.1.1 to 4.2.2
….com/cilium/ebpf-0.22.0 build(deps): bump github.com/cilium/ebpf from 0.17.3 to 0.22.0
….com/rootless-containers/rootlesskit/v3-3.1.0 build(deps): bump github.com/rootless-containers/rootlesskit/v3 from 3.0.2 to 3.1.0
Bumps the docker group with 1 update in the / directory: [github.com/docker/cli](https://github.com/docker/cli). Updates `github.com/docker/cli` from 29.7.1+incompatible to 29.7.2+incompatible - [Commits](docker/cli@v29.7.1...v29.7.2) --- updated-dependencies: - dependency-name: github.com/docker/cli dependency-version: 29.7.2+incompatible dependency-type: direct:production update-type: version-update:semver-patch dependency-group: docker ... Signed-off-by: dependabot[bot] <support@github.com>
Remove code that is no longer reachable, as reported by `golang.org/x/tools/cmd/deadcode -test ./...`: - The legacy `testutil.Base`/`testutil.Cmd` test framework (`testutil.NewBase` and friends), superseded by Tigron/nerdtest. - `pkg/testutil/testregistry`, only referenced from a commented-out test. - Unused helpers in `cmd/nerdctl/helpers` (`ComposeUp`, `NewCosignKeyPair`, `CreateBuildContext`). - Unused library functions in `pkg/cmd/container`, `pkg/resolvconf`, `pkg/rootlessutil`, `pkg/internal/filesystem`, and `pkg/api/types/cri`. Also update `docs/testing/README.md` to stop referring to the removed API. Assisted-by: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
fix: do not require CNI plugins for compose projects that avoid CNI
…-de62616b35 build(deps): bump github.com/docker/cli from 29.7.1+incompatible to 29.7.2+incompatible in the docker group across 1 directory
These options are implemented in mountutil; stop listing them as unimplemented and describe the selinux-enabled requirement. Fixes #3867 Signed-off-by: Vedant Madane <vedantnm@gmail.com>
Bumps the golang-x group with 3 updates: [golang.org/x/crypto](https://github.com/golang/crypto), [golang.org/x/net](https://github.com/golang/net) and [golang.org/x/text](https://github.com/golang/text). Updates `golang.org/x/crypto` from 0.54.0 to 0.55.0 - [Commits](golang/crypto@v0.54.0...v0.55.0) Updates `golang.org/x/net` from 0.57.0 to 0.58.0 - [Commits](golang/net@v0.57.0...v0.58.0) Updates `golang.org/x/text` from 0.40.0 to 0.41.0 - [Release notes](https://github.com/golang/text/releases) - [Commits](golang/text@v0.40.0...v0.41.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-version: 0.55.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x - dependency-name: golang.org/x/net dependency-version: 0.58.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x - dependency-name: golang.org/x/text dependency-version: 0.41.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: golang-x ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps the moby-sys group with 1 update: [github.com/moby/sys/userns](https://github.com/moby/sys). Updates `github.com/moby/sys/userns` from 0.1.0 to 0.2.0 - [Release notes](https://github.com/moby/sys/releases) - [Commits](moby/sys@user/v0.1.0...user/v0.2.0) --- updated-dependencies: - dependency-name: github.com/moby/sys/userns dependency-version: 0.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: moby-sys ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/containerd/containerd/v2](https://github.com/containerd/containerd) from 2.3.3 to 2.3.4. - [Release notes](https://github.com/containerd/containerd/releases) - [Changelog](https://github.com/containerd/containerd/blob/v2.3.4/RELEASES.md) - [Commits](containerd/containerd@v2.3.3...v2.3.4) --- updated-dependencies: - dependency-name: github.com/containerd/containerd/v2 dependency-version: 2.3.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Remove unused functions
docs: document volume :z and :Z SELinux options
…ys-599fb6b3f3 build(deps): bump github.com/moby/sys/userns from 0.1.0 to 0.2.0 in the moby-sys group
….com/containerd/containerd/v2-2.3.4 build(deps): bump github.com/containerd/containerd/v2 from 2.3.3 to 2.3.4
Bumps [github.com/containerd/accelerated-container-image](https://github.com/containerd/accelerated-container-image) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/containerd/accelerated-container-image/releases) - [Commits](containerd/accelerated-container-image@v1.4.3...v1.4.4) --- updated-dependencies: - dependency-name: github.com/containerd/accelerated-container-image dependency-version: 1.4.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Replace the remaining callers of `testutil.Identifier(t)` with Tigron's `data.Identifier()` (or, for subtests that need the parent's name, a label set in `Setup`), and remove `testutil.Identifier`. The non-Tigron unit tests in pkg/netutil just use `t.Name()` for the scratch file name, which was irrelevant anyway. Assisted-by: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Replace `testutil.RequireKernelVersion` and `testutil.RequireSystemService` (which called t.Skip imperatively from inside a test body or Setup) with proper `*test.Requirement`s: `nerdtest.KernelVersion(constraint)` and `nerdtest.SystemService(name)`, and move the callers to `testCase.Require`. Assisted-by: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Tests should read the namespace they actually run in from the Tigron config (`helpers.Read(nerdtest.Namespace)`) rather than hardcoding the `testutil.Namespace` constant, which is wrong for `nerdtest.Private` tests and for Kubernetes runs. Move the default value into nerdtest and drop `testutil.Namespace`. Assisted-by: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
…-x-c95ec50ace build(deps): bump the golang-x group with 3 updates
Signed-off-by: MsfPablo <pablogarciacaceres5@gmail.com>
…zmorcore/zizmor-action-0.6.2 build(deps): bump zizmorcore/zizmor-action from 0.6.1 to 0.6.2
Signed-off-by: ChengyuZhu6 <hudson@cyzhu.com>
testutil: migrate more functions to Tigron
….com/containerd/accelerated-container-image-1.4.4 build(deps): bump github.com/containerd/accelerated-container-image from 1.4.3 to 1.4.4
ci: upgrade containerd to v2.4.0-beta.0
Fix typos in docs and a comment
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )