diff --git a/.abf.yml b/.abf.yml index 0112daa..630c602 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - buildx-0.10.5.tar.gz: ebfb3eb86e2e7776d90930fa2eef0b22193cddf3 - cli-26.0.2.tar.gz: ae03c10fe3c124e90217aa18b283a4bafb775c28 + buildx-0.14.0.tar.gz: d28aea9ed2a9fca969e4ba2ad926c2daf9e49c29 + cli-26.1.3.tar.gz: 63b83ed6efe0d0b0bc01345c74c80893c21ead01 libnetwork-master.tar.gz: 3d5fff39d764e56b927223527e3355c07a82939f - moby-26.0.2.tar.gz: c2f20445c261e598ecdba01ceb80c456b6693e3b + moby-26.1.3.tar.gz: ca749290f43c89e8ceb38365b340af8ec6ff2a7e tini-0.19.0.tar.gz: 2245210bdd29faea02e566a192df4c7df702b264 diff --git a/docker.spec b/docker.spec index 86c64a1..bd42e48 100644 --- a/docker.spec +++ b/docker.spec @@ -1,7 +1,7 @@ # modifying the dockerinit binary breaks the SHA1 sum check by docker %global tini_version 0.19.0 -%global buildx_version 0.10.5 +%global buildx_version 0.14.0 %global project docker %global repo %{project} @@ -16,7 +16,7 @@ Summary: Automates deployment of containerized applications Name: docker -Version: 26.0.2 +Version: 26.1.3 %global moby_version %{version} Release: 1 License: ASL 2.0 @@ -62,8 +62,9 @@ Requires(pre): systemd %systemd_requires # With docker >= 1.11 you now need containerd (and runC or crun as a dep) Requires: containerd -Requires: runc -Recommends: crun +Recommends: runc +Requires: crun +Requires: docker-compose # need xz to work with ubuntu images # https://bugzilla.redhat.com/show_bug.cgi?id=1045220 Requires: xz @@ -186,7 +187,13 @@ install -d %{buildroot}%{_sysconfdir}/docker # from having net access -- allow them to keep using iptables for now cat > %{buildroot}%{_sysconfdir}/docker/daemon.json << 'EOF' { - "iptables": true + "iptables": true, + "default-runtime": "crun", + "runtimes": { + "crun": { + "path": "/usr/bin/crun" + } + } } EOF install -D -p -m 755 %{SOURCE14} %{buildroot}%{_sysconfdir}/nftables/%{name}.nft