diff --git a/packages/containerd-2.1/containerd-config-toml_basic b/packages/containerd-2.1/containerd-config-toml_basic index 780f4cdcc..a62eb8e85 100644 --- a/packages/containerd-2.1/containerd-config-toml_basic +++ b/packages/containerd-2.1/containerd-config-toml_basic @@ -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}} diff --git a/packages/docker-engine-29/.gitignore b/packages/docker-engine-29/.gitignore new file mode 100644 index 000000000..404105371 --- /dev/null +++ b/packages/docker-engine-29/.gitignore @@ -0,0 +1 @@ +0003-Switch-containerd-image-backend-s-image-pull-to-tran.patch diff --git a/packages/docker-engine-29/Cargo.toml b/packages/docker-engine-29/Cargo.toml index 57cb69f8c..b73680c69 100644 --- a/packages/docker-engine-29/Cargo.toml +++ b/packages/docker-engine-29/Cargo.toml @@ -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" } diff --git a/packages/docker-engine-29/daemon-json b/packages/docker-engine-29/daemon-json index 78fd555cc..ffd0915d2 100644 --- a/packages/docker-engine-29/daemon-json +++ b/packages/docker-engine-29/daemon-json @@ -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}}, diff --git a/packages/docker-engine-29/daemon-nvidia-json b/packages/docker-engine-29/daemon-nvidia-json index cfe80223e..1af31ac72 100644 --- a/packages/docker-engine-29/daemon-nvidia-json +++ b/packages/docker-engine-29/daemon-nvidia-json @@ -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}} diff --git a/packages/docker-engine-29/docker-engine-29.spec b/packages/docker-engine-29/docker-engine-29.spec index 4f1a8429f..393c26e99 100644 --- a/packages/docker-engine-29/docker-engine-29.spec +++ b/packages/docker-engine-29/docker-engine-29.spec @@ -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