Skip to content

[release/2.0] Cherry-picks to fix CI#13175

Merged
samuelkarp merged 4 commits intocontainerd:release/2.0from
samuelkarp:omnibus-ci-fixes-2.0
Apr 7, 2026
Merged

[release/2.0] Cherry-picks to fix CI#13175
samuelkarp merged 4 commits intocontainerd:release/2.0from
samuelkarp:omnibus-ci-fixes-2.0

Conversation

@samuelkarp
Copy link
Copy Markdown
Member

@samuelkarp samuelkarp commented Apr 7, 2026

Signed-off-by: ningmingxiao <[email protected]>
(cherry picked from commit 4287492)
Signed-off-by: Samuel Karp <[email protected]>
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review Apr 7, 2026
@dosubot dosubot Bot added the github_actions Pull requests that update GitHub Actions code label Apr 7, 2026
rata and others added 2 commits April 7, 2026 12:53
If docker in the host is configured to use the containerd image format,
then the docker pull/save commands above download the multi-platform
image. IOW, the index.json has references to the other platforms SHAs.

This references to things that are not present (the artifacts for other
platforms) is what make `ctr` fail. However, if we specify a platform,
then ctr ignores the other platforms and the import works just fine.

To try this locally, you can:
	$ docker pull ghcr.io/containerd/busybox:1.36
	$ docker save ghcr.io/containerd/busybox:1.36 -o image.tar
	$ ctr images import --local=true image.tar

The last command will fail if you are using the containerd image store
in docker. If you specify the platform with --platform, it works fine.

With docker overlayfs2 storage driver, if you untar the image you get only
things relevant for your platform:

```
$ cat index.json | jq
{
  "schemaVersion": 2,
  "mediaType": "application/vnd.oci.image.index.v1+json",
  "manifests": [
    {
      "mediaType": "application/vnd.oci.image.manifest.v1+json",
      "digest": "sha256:4d6b13f2ddbe87da8d9dee3719df1723a6d768e511802e70d42ab15370c6eb24",
      "size": 401,
      "annotations": {
        "io.containerd.image.name": "ghcr.io/containerd/busybox:1.36",
        "org.opencontainers.image.ref.name": "1.36"
      }
    }
  ]
}
$ cat blobs/sha256/4d6b13f2ddbe87da8d9dee3719df1723a6d768e511802e70d42ab15370c6eb24 | jq
{
  "schemaVersion": 2,
  "mediaType": "application/vnd.oci.image.manifest.v1+json",
  "config": {
    "mediaType": "application/vnd.oci.image.config.v1+json",
    "digest": "sha256:66ba00ad3de8677a3fa4bc4ea0fc46ebca0f14db46ca365e7f60833068dd0148",
    "size": 1457
  },
  "layers": [
    {
      "mediaType": "application/vnd.oci.image.layer.v1.tar",
      "digest": "sha256:b64792c17e4ad443d16b218afb3a8f5d03ca0f4ec49b11c1a7aebe17f6c3c1d2",
      "size": 5096448
    }
  ]
}
```

But with the other you get for lot of other platforms too:

```

$ cat index.json | jq
{
  "schemaVersion": 2,
  "mediaType": "application/vnd.oci.image.index.v1+json",
  "manifests": [
    {
      "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
      "digest": "sha256:7b3ccabffc97de872a30dfd234fd972a66d247c8cfc69b0550f276481852627c",
      "size": 2295,
      "annotations": {
        "containerd.io/distribution.source.ghcr.io": "containerd/busybox",
        "io.containerd.image.name": "ghcr.io/containerd/busybox:1.36",
        "org.opencontainers.image.ref.name": "1.36"
      }
    }
  ]
}
$ cat blobs/sha256/7b3ccabffc97de872a30dfd234fd972a66d247c8cfc69b0550f276481852627c | jq
{
  "manifests": [
    {
      "digest": "sha256:907ca53d7e2947e849b839b1cd258c98fd3916c60f2e6e70c30edbf741ab6754",
      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
      "platform": {
        "architecture": "amd64",
        "os": "linux"
      },
      "size": 528
    },
    {
      "digest": "sha256:dde8e930c7b6a490f728e66292bc9bce42efc9bbb5278bae40e4f30f6e00fe8c",
      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
      "platform": {
        "architecture": "arm",
        "os": "linux",
        "variant": "v5"
      },
      "size": 528
    },
    {
    ...
```

You can switch to the containerd snapshotter in docker by adding this to the daemon.json:
```
{
  "features": {
    "containerd-snapshotter": true
  }
}

```

Signed-off-by: Rodrigo Campos <[email protected]>
(cherry picked from commit fafbfcb)
Signed-off-by: Samuel Karp <[email protected]>
Update the OSS-Fuzz CIFuzz action references from commit abe2c06d
(Oct 2024) to c8c1b257 (Dec 2025) which includes support for
Ubuntu 24.04 base images. The new version reads
`base_os_version: ubuntu-24-04` from the
containerd project.yaml.

Signed-off-by: Davanum Srinivas <[email protected]>
(cherry picked from commit d958fb2)
Signed-off-by: Samuel Karp <[email protected]>
@samuelkarp samuelkarp force-pushed the omnibus-ci-fixes-2.0 branch from 9353b3a to 9c656fa Compare April 7, 2026 19:54
Signed-off-by: Maksym Pavlenko <[email protected]>
(cherry picked from commit 85dedef)
Signed-off-by: Samuel Karp <[email protected]>
@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review Apr 7, 2026
@samuelkarp samuelkarp merged commit 7a074ac into containerd:release/2.0 Apr 7, 2026
55 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Apr 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

github_actions Pull requests that update GitHub Actions code size/S

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

8 participants