Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from containerd:main #288

Open
wants to merge 1,887 commits into
base: main
Choose a base branch
from
Open

[pull] main from containerd:main #288

wants to merge 1,887 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Jun 26, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Jun 26, 2023
AkihiroSuda and others added 29 commits November 4, 2024 09:21
Enable more tests to run on windows
…rs by nerdctl rmi -f

In Docker, running `docker rmi -f <Image Names>` on images associated with
running or stopped containers will untag the images, leaving <none> images.

The specific behavior in Docker is as follows.

```
> docker images
REPOSITORY   TAG       IMAGE ID       CREATED       SIZE
alpine       latest    91ef0af61f39   6 weeks ago   7.8MB

> docker ps
CONTAINER ID   IMAGE     COMMAND            CREATED         STATUS         PORTS     NAMES
fe4caab5cf42   alpine    "sleep infinity"   4 minutes ago   Up 4 minutes             test

> docker rmi -f alpine
Untagged: alpine:latest
Untagged: alpine@sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d

> docker images
REPOSITORY   TAG       IMAGE ID       CREATED       SIZE
<none>       <none>    91ef0af61f39   6 weeks ago   7.8MB
```

On the other hand, the same operation described above with nerdctl will
result in the following error.

```
> nerdctl rmi -f alpine
FATA[0000] 1 errors:
conflict: unable to delete alpine (cannot be forced) - image is being used by running container 59261bebc8113ca1ea102203137c32406742c2ec43ca3b108a314e9bfb4657fb
```

This befavior is reported in the following:

- #3454

Therefore, this commit fixes it so that `nerdctl rmi -f <Image Names>` can
be performed on images associated with running or stopped containers.

The behaviour in nerdctl after this modification is as follows.

```
> nerdctl images
REPOSITORY    TAG       IMAGE ID        CREATED          PLATFORM       SIZE       BLOB SIZE
alpine        latest    beefdbd8a1da    5 seconds ago    linux/amd64    8.458MB    3.626MB

> nerdctl ps
CONTAINER ID    IMAGE                              COMMAND             CREATED          STATUS    PORTS    NAMES
28c9db821576    docker.io/library/alpine:latest    "sleep infinity"    6 seconds ago    Up                 alpine-28c9d

> nerdctl rmi -f alpine
Untagged: docker.io/library/alpine:latest
Untagged: sha256:beefdbd8a1da6d2915566fde36db9db0b524eb737fc57cd1367effd16dc0d06d

> nerdctl images
REPOSITORY    TAG       IMAGE ID        CREATED          PLATFORM       SIZE       BLOB SIZE
<none>        <none>    beefdbd8a1da    3 seconds ago    linux/amd64    8.458MB    3.626MB
```

Signed-off-by: Hayato Kiwata <[email protected]>
fix: Allow to untag images associated with running or paused containe…
In the current implementation, detaching from a container started with
`nerdctl run --rm ...` unexpectedly removes it.

The behaviour before this modification is as follows.

```
> nerdctl run --rm -it --detach-keys=ctrl-a,ctrl-b --name test alpine
/ # INFO[0002] read detach keys

> nerdctl ps
CONTAINER ID    IMAGE    COMMAND    CREATED    STATUS    PORTS    NAMES
```

When the same operation is performed in the Docker CLI, the container will
not be deleted.

This issue is reported in the following:

- #3568

Therefore, this commit resolves this behaviour of a container not being
deleted on detachment.

Note that the behaviour after this modification is as follows.

```
> nerdctl run --rm -it --detach-keys=ctrl-a,ctrl-b --name test alpine
/ # INFO[0010] read detach keys

> nerdctl ps
CONTAINER ID    IMAGE                                        COMMAND      CREATED           STATUS    PORTS    NAMES
46f4c829e5cc    docker.io/library/alpine:latest              "/bin/sh"    15 seconds ago    Up                 test
```

This PR has also been modified to remove a container when detaching and
attaching a container started with the --rm option.
The detailed behaviour is as follows.

```
> nerdctl attach test

/ # exit

> nerdctl ps -a
CONTAINER ID    IMAGE    COMMAND    CREATED    STATUS    PORTS    NAMES

```

Signed-off-by: Hayato Kiwata <[email protected]>
Signed-off-by: Arjun Raja Yogidas <[email protected]>
Bumps [github.com/containerd/errdefs](https://github.com/containerd/errdefs) from 0.3.0 to 1.0.0.
- [Release notes](https://github.com/containerd/errdefs/releases)
- [Commits](containerd/errdefs@v0.3.0...v1.0.0)

---
updated-dependencies:
- dependency-name: github.com/containerd/errdefs
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4.2.1...v4.2.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
….com/containerd/errdefs-1.0.0

build(deps): bump github.com/containerd/errdefs from 0.3.0 to 1.0.0
…tions/checkout-4.2.2

build(deps): bump actions/checkout from 4.2.1 to 4.2.2
Bumps the containerd group with 1 update: [github.com/containerd/containerd/api](https://github.com/containerd/containerd).


Updates `github.com/containerd/containerd/api` from 1.8.0-rc.4 to 1.8.0
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@api/v1.8.0-rc.4...api/v1.8.0)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: containerd
...

Signed-off-by: dependabot[bot] <[email protected]>
…nerd-7c550e2598

build(deps): bump github.com/containerd/containerd/api from 1.8.0-rc.4 to 1.8.0 in the containerd group
Bumps [github.com/containerd/typeurl/v2](https://github.com/containerd/typeurl) from 2.2.1 to 2.2.2.
- [Release notes](https://github.com/containerd/typeurl/releases)
- [Commits](containerd/typeurl@v2.2.1...v2.2.2)

---
updated-dependencies:
- dependency-name: github.com/containerd/typeurl/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
fix: not to be deleted a container created with --rm when detaching
….com/containerd/typeurl/v2-2.2.2

build(deps): bump github.com/containerd/typeurl/v2 from 2.2.1 to 2.2.2
Bumps [github.com/containerd/containerd/v2](https://github.com/containerd/containerd) from 2.0.0-rc.6 to 2.0.0.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](containerd/containerd@v2.0.0-rc.6...v2.0.0)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
….com/containerd/containerd/v2-2.0.0

build(deps): bump github.com/containerd/containerd/v2 from 2.0.0-rc.6 to 2.0.0
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
update containerd (2.0.0), runc (1.2.1), BuildKit (0.17.0), etc.
json.Encode will escase characters like '<', '>', '&'

Signed-off-by: xyz-li <[email protected]>
[fix] avoid escaping '<', '>', '&'
typo: remove extra colons and whitespaces #3650
djdongjin and others added 30 commits January 14, 2025 08:36
This commit refactors TestRunWithInvalidPortThenCleanUp in
cmd/nerdctl/container/container_run_network_linux_test.go based on the
principles in the following document.

- https://github.com/containerd/nerdctl/tree/main/docs/testing#principles

Signed-off-by: Hayato Kiwata <[email protected]>
This commit adds the logic to clean up an orphaned etchosts directory for
the container that failed to create.

Signed-off-by: Hayato Kiwata <[email protected]>
This commit adds an test for added logic to clean up an orphaned etchosts
directory for the container that failed to create to
TestRunWithInvalidPortThenCleanUp.

Signed-off-by: Hayato Kiwata <[email protected]>
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.11.0 to 6.12.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@b32b51a...67a2d40)

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

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.1.1 to 6.2.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@971e284...ec5d184)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…osts-directory

fix: clean up an orphaned etchosts directory for the container that failed to create
…langci/golangci-lint-action-6.2.0

build(deps): bump golangci/golangci-lint-action from 6.1.1 to 6.2.0
Suppose we try to save multiple container images with the same image ID
but different image names into a tar archive using the nerdctl save
command.

When we then try to load container images from this tar archive using the
nerdctl load command, not all container images will be loaded.

This behavior is reported and the details are described in the following:

- #3806

Therefore, this PR resolves this issue.

Signed-off-by: Hayato Kiwata <[email protected]>
Correct `compose logs` command reference
Introduce documentation for AppArmor profile for rootlesskit.

Signed-off-by: fahed dorgaa <[email protected]>
…rivileged-userns

[doc] Add AppArmor profile setup for rootlesskit on Ubuntu 24.04+
…cker/build-push-action-6.12.0

build(deps): bump docker/build-push-action from 6.11.0 to 6.12.0
fix: save multiple images for the same image id to a tar archive
reset spec if update returned error
Bumps [github.com/rootless-containers/rootlesskit/v2](https://github.com/rootless-containers/rootlesskit) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/rootless-containers/rootlesskit/releases)
- [Commits](rootless-containers/rootlesskit@v2.3.1...v2.3.2)

---
updated-dependencies:
- dependency-name: github.com/rootless-containers/rootlesskit/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
….com/rootless-containers/rootlesskit/v2-2.3.2

build(deps): bump github.com/rootless-containers/rootlesskit/v2 from 2.3.1 to 2.3.2
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
update containerd (2.0.2), RootlessKit (2.3.2), bypass4netns (0.4.2), containerd-fuse-overlayfs (2.1.1), BuildKit (0.19.0)
[Carry 3827] update Kubo (0.32.1)
Bumps [github.com/rootless-containers/bypass4netns](https://github.com/rootless-containers/bypass4netns) from 0.4.1 to 0.4.2.
- [Commits](rootless-containers/bypass4netns@v0.4.1...v0.4.2)

---
updated-dependencies:
- dependency-name: github.com/rootless-containers/bypass4netns
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
….com/rootless-containers/bypass4netns-0.4.2

build(deps): bump github.com/rootless-containers/bypass4netns from 0.4.1 to 0.4.2
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.