Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: moby/buildkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.20.1
Choose a base ref
...
head repository: moby/buildkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.20.2
Choose a head ref
  • 3 commits
  • 10 files changed
  • 3 contributors

Commits on Mar 24, 2025

  1. update RootlessKit to v2.3.4 

    Contains a fix for Ubuntu 25.04
https://github.com/rootless-containers/rootlesskit/releases/tag/v2.3.3
https://github.com/rootless-containers/rootlesskit/releases/tag/v2.3.4

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit cecae00)
    @AkihiroSuda @jsternberg
    AkihiroSuda authored and jsternberg committed Mar 24, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    4475fc9 View commit details

  2. Update containerd to v2.0.4 

    Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 6636ddb)
    @dmcgowan @jsternberg
    dmcgowan authored and jsternberg committed Mar 24, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    7c47445 View commit details

  3. Merge pull request #5874 from jsternberg/v0.20.2-picks 

    [v0.20] cherry-picks for v0.20.2
    @jsternberg
    jsternberg authored Mar 24, 2025
    Loading
    Loading status checks…
    Copy the full SHA
    97437fd View commit details
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ ARG CONTAINERD_VERSION=v2.0.2
ARG CONTAINERD_ALT_VERSION_17=v1.7.25
ARG CONTAINERD_ALT_VERSION_16=v1.6.36
ARG REGISTRY_VERSION=v2.8.3
ARG ROOTLESSKIT_VERSION=v2.3.2
ARG ROOTLESSKIT_VERSION=v2.3.4
ARG CNI_VERSION=v1.5.1
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
ARG NERDCTL_VERSION=v1.6.2
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
github.com/containerd/console v1.0.4
github.com/containerd/containerd/api v1.8.0
github.com/containerd/containerd/v2 v2.0.3
github.com/containerd/containerd/v2 v2.0.4
github.com/containerd/continuity v0.4.5
github.com/containerd/errdefs v1.0.0
github.com/containerd/fuse-overlayfs-snapshotter/v2 v2.1.1
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -97,8 +97,8 @@ github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn
github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
github.com/containerd/containerd/api v1.8.0 h1:hVTNJKR8fMc/2Tiw60ZRijntNMd1U+JVMyTRdsD2bS0=
github.com/containerd/containerd/api v1.8.0/go.mod h1:dFv4lt6S20wTu/hMcP4350RL87qPWLVa/OHOwmmdnYc=
github.com/containerd/containerd/v2 v2.0.3 h1:zBKgwgZsuu+LPCMzCLgA4sC4MiZzZ59ZT31XkmiISQM=
github.com/containerd/containerd/v2 v2.0.3/go.mod h1:5j9QUUaV/cy9ZeAx4S+8n9ffpf+iYnEj4jiExgcbuLY=
github.com/containerd/containerd/v2 v2.0.4 h1:+r7yJMwhTfMm3CDyiBjMBQO8a9CTBxL2Bg/JtqtIwB8=
github.com/containerd/containerd/v2 v2.0.4/go.mod h1:5j9QUUaV/cy9ZeAx4S+8n9ffpf+iYnEj4jiExgcbuLY=
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
3 changes: 2 additions & 1 deletion vendor/github.com/containerd/containerd/v2/client/client.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/containerd/containerd/v2/core/images/image.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions vendor/github.com/containerd/containerd/v2/core/images/mediatypes.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/containerd/containerd/v2/core/remotes/handlers.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 20 additions & 4 deletions vendor/github.com/containerd/containerd/v2/pkg/oci/spec_opts.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion vendor/github.com/containerd/containerd/v2/version/version.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
@@ -301,7 +301,7 @@ github.com/containerd/containerd/api/types/runc/options
github.com/containerd/containerd/api/types/runtimeoptions/v1
github.com/containerd/containerd/api/types/task
github.com/containerd/containerd/api/types/transfer
# github.com/containerd/containerd/v2 v2.0.3
# github.com/containerd/containerd/v2 v2.0.4
## explicit; go 1.22.0
github.com/containerd/containerd/v2/client
github.com/containerd/containerd/v2/core/containers