Skip to content

Add patches to docker-engine-29 #730

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.

Sign up for GitHub

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

Merged
koooosh merged 3 commits into from
Nov 10, 2025
Merged

Add patches to docker-engine-29 #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1103e1
docker-engine-29: add patch to always use containerd transfer service
koooosh Nov 8, 2025
cdd4e5d
containerd-2.1: update basic config to use transfer service
koooosh Nov 8, 2025
5070375
docker-engine-29: replace overlay2 as storage-driver in daemon jsons
koooosh Nov 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/containerd-2.1/containerd-config-toml_basic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,22 @@ disabled_plugins = [
"io.containerd.tracing.processor.v1.otlp",
]

imports = ["/etc/containerd/config.d/*.toml"]

[grpc]
address = "/run/containerd/containerd.sock"

[plugins."io.containerd.transfer.v1.local"]
max_concurrent_downloads = 10
concurrent_layer_fetch_buffer = 8388608

[[plugins."io.containerd.transfer.v1.local".unpack_config]]
snapshotter = "overlayfs"
differ = "walking"
{{#if (eq os.arch "aarch64")}}
platform = "linux/arm64"
{{else}}
{{#if (eq os.arch "x86_64")}}
platform = "linux/amd64"
{{/if}}
{{/if}}
1 change: 1 addition & 0 deletions packages/docker-engine-29/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0003-Switch-containerd-image-backend-s-image-pull-to-tran.patch
4 changes: 4 additions & 0 deletions packages/docker-engine-29/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ releases-url = "https://github.com/moby/moby/releases"
url = "https://github.com/moby/moby/archive/docker-v29.0.0-rc.2/moby-docker-v29.0.0-rc.2.tar.gz"
sha512 = "89237d52822608d95327efaded6e27f3b10a5252e4c3065dd5f22cf4614d950bdb67ca9770895ad09847eb7f8f0cacf1062220d2078109e5d21e93890cdb4304"

[[package.metadata.build-package.external-files]]
url = "https://cache.bottlerocket.aws/0003-Switch-containerd-image-backend-s-image-pull-to-tran.patch/b35958b9ec38aa14d52cb0a5fe5c7373d523a0f24287a58fd3961a0f57f0bf59741d06645e0a763dda651e0f6846aabc1c3507085caf08c04ce3c34d887a44eb/0003-Switch-containerd-image-backend-s-image-pull-to-tran.patch"
sha512 = "b35958b9ec38aa14d52cb0a5fe5c7373d523a0f24287a58fd3961a0f57f0bf59741d06645e0a763dda651e0f6846aabc1c3507085caf08c04ce3c34d887a44eb"

[build-dependencies]
glibc = { path = "../glibc" }
libseccomp = { path = "../libseccomp" }
Expand Down
2 changes: 1 addition & 1 deletion packages/docker-engine-29/daemon-json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ std = { version = "v1", helpers = ["join_array"] }
"log-driver": "journald",
"live-restore": true,
"max-concurrent-downloads": 10,
"storage-driver": "overlay2",
"storage-driver": "overlayfs",
"data-root": "/var/lib/docker",
{{#if settings.oci-defaults.capabilities}}
"default-capabilities": {{oci_defaults "docker" settings.oci-defaults.capabilities}},
Expand Down
2 changes: 1 addition & 1 deletion packages/docker-engine-29/daemon-nvidia-json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ std = { version = "v1", helpers = ["join_array"] }
"log-driver": "journald",
"live-restore": true,
"max-concurrent-downloads": 10,
"storage-driver": "overlay2",
"storage-driver": "overlayfs",
"data-root": "/var/lib/docker",
"runtimes": { "nvidia": { "path": "nvidia-container-runtime" } },
{{#if settings.oci-defaults.capabilities}}
Expand Down
1 change: 1 addition & 0 deletions packages/docker-engine-29/docker-engine-29.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Source1000: clarify.toml

Patch0001: 0001-Change-default-capabilities-using-daemon-config.patch
Patch0002: 0002-oci-inject-kmod-in-all-containers.patch
Patch0003: 0003-Switch-containerd-image-backend-s-image-pull-to-tran.patch

BuildRequires: git
BuildRequires: %{_cross_os}glibc-devel
Expand Down