Skip to content

[pull] main from containerd:main#307

Open
pull[bot] wants to merge 888 commits intofahedouch:mainfrom
containerd:main
Open

[pull] main from containerd:main#307
pull[bot] wants to merge 888 commits intofahedouch:mainfrom
containerd:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented May 10, 2025

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 : )

@pull pull bot added the ⤵️ pull label May 10, 2025
zhangyoufu and others added 29 commits December 24, 2025 14:43
This commit addresses the issue where nerdctl was unconditionally
stripping localhost DNS servers from /etc/resolv.conf when container
is using host network.

Fixes: #4651
Signed-off-by: Youfu Zhang <zhangyoufu@gmail.com>
support nerdctl search command

Signed-off-by: ChengyuZhu6 <hudson@cyzhu.com>
Signed-off-by: Hayato Kiwata <haytok@amazon.co.jp>
Updates tests to use nerdtest.Setup and the Tigron testing framework
as per issue #4613.

Signed-off-by: Nuwed Munshi <nuwed.munshi@gmail.com>
…_test.go

test: refactor compose_create_linux_test.go to use Tigron
`lint / go / linux (go canary)` was often timing out

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
MAINTAINERS: promote Chengyu Zhu (ChengyuZhu6) from a REVIEWER to a COMMITTER
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
MAINTAINERS: add Hayato Kiwata (haytok) as a REVIEWER
…est.go

test: refactor compose_down_linux_test.go to use Tigron
…st-tigron

Refactor/container start test tigron
CI: lint: increase timeout
…est.go

test: refactor compose_kill_linux_test.go to use Tigron
Bumps the golang-x group with 1 update: [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/sys` from 0.39.0 to 0.40.0
- [Commits](golang/sys@v0.39.0...v0.40.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
fix: allow localhost DNS servers when using host network
…-x-e2678a00b5

build(deps): bump golang.org/x/sys from 0.39.0 to 0.40.0 in the golang-x group
Bumps the golang-x group with 2 updates: [golang.org/x/term](https://github.com/golang/term) and [golang.org/x/text](https://github.com/golang/text).


Updates `golang.org/x/term` from 0.38.0 to 0.39.0
- [Commits](golang/term@v0.38.0...v0.39.0)

Updates `golang.org/x/text` from 0.32.0 to 0.33.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.32.0...v0.33.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-version: 0.39.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/text
  dependency-version: 0.33.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 docker group with 1 update: [github.com/docker/cli](https://github.com/docker/cli).


Updates `github.com/docker/cli` from 29.1.3+incompatible to 29.1.4+incompatible
- [Commits](docker/cli@v29.1.3...v29.1.4)

---
updated-dependencies:
- dependency-name: github.com/docker/cli
  dependency-version: 29.1.4+incompatible
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: docker
...

Signed-off-by: dependabot[bot] <support@github.com>
In the current implementation, specifying an invalid string for the --pull
option of the nerdctl compose create command causes it to fall back to
missing, allowing the image to be pulled as shown below.

```
$ sudo nerdctl compose create --pull foo
WARN[0000] Ignoring: service svc0: pull_policy: "foo"
INFO[0000] Ensuring image alpine
...
INFO[0004] Creating container fix-compose-pull-policy-with-invalid-option-svc0-1
```

On the other hand, docker compose returns the following error in a similar
situation.

```
$ docker compose create --pull foo
invalid --pull option "foo"
```

This commit fixes it to be compatible with docker compose.

Signed-off-by: Hayato Kiwata <dev@haytok.jp>
…-6d54fcc478

build(deps): bump github.com/docker/cli from 29.1.3+incompatible to 29.1.4+incompatible in the docker group
…alid-option

fix: return error for invalid --pull option in nerdctl compose create
…-x-a63f6d53e1

build(deps): bump the golang-x group with 2 updates
Signed-off-by: Hayato Kiwata <dev@haytok.jp>
docs/command-reference.md: fix anchors without blue_square
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@4dc6199...7a3fe6c)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-version: 6.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/go-viper/mapstructure/v2](https://github.com/go-viper/mapstructure) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/go-viper/mapstructure/releases)
- [Changelog](https://github.com/go-viper/mapstructure/blob/main/CHANGELOG.md)
- [Commits](go-viper/mapstructure@v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: github.com/go-viper/mapstructure/v2
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Hajime Ogi <robertcal900@gmail.com>
Signed-off-by: Hayato Kiwata <dev@haytok.jp>
Swapnanil-Gupta and others added 30 commits April 8, 2026 18:59
Signed-off-by: Swapnanil Gupta <swpnlg@amazon.com>
Bumps the golang-x group with 1 update: [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/sys` from 0.42.0 to 0.43.0
- [Commits](golang/sys@v0.42.0...v0.43.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sys
  dependency-version: 0.43.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 docker group with 1 update: [github.com/docker/cli](https://github.com/docker/cli).


Updates `github.com/docker/cli` from 29.3.1+incompatible to 29.4.0+incompatible
- [Commits](docker/cli@v29.3.1...v29.4.0)

---
updated-dependencies:
- dependency-name: github.com/docker/cli
  dependency-version: 29.4.0+incompatible
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: docker
...

Signed-off-by: dependabot[bot] <support@github.com>
…-662b657367

build(deps): bump github.com/docker/cli from 29.3.1+incompatible to 29.4.0+incompatible in the docker group across 1 directory
….com/compose-spec/compose-go/v2-2.10.2

build(deps): bump github.com/compose-spec/compose-go/v2 from 2.10.1 to 2.10.2
…-x-ec1cff6765

build(deps): bump golang.org/x/sys from 0.42.0 to 0.43.0 in the golang-x group
- slirp4netns is no longer needed as gvisor-tap-vsock is now embedded in RootlessKit.
  slirp4netns is still used when installed.
- The `builtin` port driver can now correctly propagate the source IP.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
….com/containerd/nydus-snapshotter-0.15.14

build(deps): bump github.com/containerd/nydus-snapshotter from 0.15.11 to 0.15.14
Bumps [github.com/mattn/go-isatty](https://github.com/mattn/go-isatty) from 0.0.20 to 0.0.21.
- [Commits](mattn/go-isatty@v0.0.20...v0.0.21)

---
updated-dependencies:
- dependency-name: github.com/mattn/go-isatty
  dependency-version: 0.0.21
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
fix: allow binding containers on different IPs to the same port
The defer function in commonLock calls file.Close() when an error
occurs, but file is always nil at that point. If os.Open or
os.OpenFile fails, file is nil. If platformSpecificLock fails, file
is closed inline and then set to nil by the return statement. In
both cases, calling file.Close() in the defer panics on a nil
pointer. Add nil check before file.Close() in the defer.

Signed-off-by: Federico Bramucci <163430291+fedebram@users.noreply.github.com>
…_linux_test_refactor

 compose_linux_restart test refactor
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 7.0.0 to 7.1.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@d08e5c3...bcafcac)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps the golang-x group with 4 updates: [golang.org/x/crypto](https://github.com/golang/crypto), [golang.org/x/net](https://github.com/golang/net), [golang.org/x/term](https://github.com/golang/term) and [golang.org/x/text](https://github.com/golang/text).


Updates `golang.org/x/crypto` from 0.49.0 to 0.50.0
- [Commits](golang/crypto@v0.49.0...v0.50.0)

Updates `golang.org/x/net` from 0.52.0 to 0.53.0
- [Commits](golang/net@v0.52.0...v0.53.0)

Updates `golang.org/x/term` from 0.41.0 to 0.42.0
- [Commits](golang/term@v0.41.0...v0.42.0)

Updates `golang.org/x/text` from 0.35.0 to 0.36.0
- [Release notes](https://github.com/golang/text/releases)
- [Commits](golang/text@v0.35.0...v0.36.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-version: 0.50.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/net
  dependency-version: 0.53.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/term
  dependency-version: 0.42.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/text
  dependency-version: 0.36.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
…d systems

Signed-off-by: Shouhei <shouhei.yamaguchi.be@gmail.com>
…-x-c9d288d6e6

build(deps): bump the golang-x group across 1 directory with 4 updates
….com/mattn/go-isatty-0.0.21

build(deps): bump github.com/mattn/go-isatty from 0.0.20 to 0.0.21
Bumps [github.com/ipfs/go-cid](https://github.com/ipfs/go-cid) from 0.6.0 to 0.6.1.
- [Release notes](https://github.com/ipfs/go-cid/releases)
- [Commits](ipfs/go-cid@v0.6.0...v0.6.1)

---
updated-dependencies:
- dependency-name: github.com/ipfs/go-cid
  dependency-version: 0.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…cker/build-push-action-7.1.0

build(deps): bump docker/build-push-action from 7.0.0 to 7.1.0
Bumps [actions/cache](https://github.com/actions/cache) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@6682284...27d5ce7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 5.0.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
….com/ipfs/go-cid-0.6.1

build(deps): bump github.com/ipfs/go-cid from 0.6.0 to 0.6.1
…tions/cache-5.0.5

build(deps): bump actions/cache from 5.0.4 to 5.0.5
…6-udp6

fix: cannot start container when IPv6 is disabled
containerd v2.3 will not support Go 1.25.
See containerd/containerd PR 13090.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
fix: nil pointer panic in commonLock defer
update containerd (2.3.0-beta.1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.