From 5a488cb16a8a2744a9b48c367d2288460e3a6824 Mon Sep 17 00:00:00 2001 From: Sergey Zhemoytel Date: Sat, 18 May 2024 13:02:56 +0000 Subject: [PATCH] 26.1.3 --- docker.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docker.spec b/docker.spec index bd42e48..98be591 100644 --- a/docker.spec +++ b/docker.spec @@ -14,11 +14,14 @@ %global commit 659604f9ee60f147020bdd444b26e4b5c636dc28 %global shortcommit %(c=%{commit}; echo ${c:0:7}) +%define _libexec /usr/libexec +%define _dockerpluginsdir %{_libexec}/docker/cli-plugins + Summary: Automates deployment of containerized applications Name: docker Version: 26.1.3 %global moby_version %{version} -Release: 1 +Release: 2 License: ASL 2.0 Epoch: 1 Group: System/Configuration/Other @@ -65,6 +68,7 @@ Requires: containerd Recommends: runc Requires: crun Requires: docker-compose +Recommends: docker-buildx # need xz to work with ubuntu images # https://bugzilla.redhat.com/show_bug.cgi?id=1045220 Requires: xz @@ -168,6 +172,8 @@ cd cli-%{version} DISABLE_WARN_OUTSIDE_CONTAINER=1 make VERSION=%{moby_version} LDFLAGS="-linkmode=external" dynbinary cd .. +# buildx +# buildx move to docker-buildx package %install # install binaries @@ -177,6 +183,8 @@ install -d %{buildroot}%{_sbindir} install -p -m 755 bundles/dynbinary-daemon/dockerd %{buildroot}%{_sbindir}/dockerd install -p -m 755 libnetwork/proxy %{buildroot}%{_bindir}/docker-proxy install -p -m 755 tini/build/tini-static %{buildroot}%{_bindir}/docker-init +install -d %{buildroot} %{_dockerpluginsdir} +install -Dm0755 buildx/buildx %{buildroot} %{_dockerpluginsdir}/docker-buildx # Place to store images install -d %{buildroot}%{_var}/lib/docker