docker static version up to 20.10.5

get from static build binary at official docker download site
https://download.docker.com/linux/static/stable/aarch64/docker-20.10.5.tgz
https://download.docker.com/linux/static/stable/armel/docker-20.10.5.tgz

Change-Id: If64798f5d181a99f7303b27642d7beefb401e123

diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec
index bb5160e..5703397 100644 (file)
--- a/packaging/docker-engine.spec
+++ b/packaging/docker-engine.spec
@@ -1,5 +1,5 @@
 Name: docker-engine
-Version: 19.03.5
+Version: 20.10.5
 Release: 0
 Summary: The open-source application container engine
 Group: Tools/Docker
@@ -10,15 +10,11 @@ Source0: %{name}.tar.gz
 Source1: %{name}.manifest
 Source2: %{name}.service
 Source3: %{name}.socket
-%ifarch aarch64
-Source12: docker-19.03.5-aarch64.tgz
-%else
-Source12: docker-19.03.5.tgz
-%endif
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+%define unpackdir source
 
 %description
 Docker is an open source project to build, ship and run any application as a
@@ -40,8 +36,8 @@ Prebuilt binaries are download from https://download.docker.com/linux/static/sta
 chmod g-w %_sourcedir/*
 cp %{SOURCE1} ./%{name}.manifest
 
-cp %{SOURCE12} .
-tar -xvf %{SOURCE12}
+mkdir -p %{unpackdir}
+tar -xvf prebuilt/docker-%{version}-%{_arch}.tgz -C %{unpackdir}
 
 cp %{SOURCE2} ./%{name}.services
 cp %{SOURCE3} ./%{name}.socket
@@ -50,7 +46,7 @@ cp %{SOURCE3} ./%{name}.socket
 rm -rf %{buildroot}
 # install binary
 install -d $RPM_BUILD_ROOT/%{_bindir}
-install -p -m 755 ./docker/* $RPM_BUILD_ROOT/%{_bindir}
+install -p -m 755 %{unpackdir}/docker/* $RPM_BUILD_ROOT/%{_bindir}
 mkdir -p %{buildroot}/opt/etc/docker
 mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
 mkdir -p %{buildroot}/usr/lib/systemd/system/sockets.target.wants

diff --git a/packaging/docker-19.03.5.tgz b/prebuilt/docker-20.10.5-aarch64.tgz
similarity index 77%
rename from packaging/docker-19.03.5.tgz
rename to prebuilt/docker-20.10.5-aarch64.tgz
index b35936f..018d2c2 100644 (file)
Binary files a/packaging/docker-19.03.5.tgz and b/prebuilt/docker-20.10.5-aarch64.tgz differ

diff --git a/packaging/docker-19.03.5-aarch64.tgz b/prebuilt/docker-20.10.5-arm.tgz
similarity index 75%
rename from packaging/docker-19.03.5-aarch64.tgz
rename to prebuilt/docker-20.10.5-arm.tgz
index ae5379a..4cb2d6f 100644 (file)
Binary files a/packaging/docker-19.03.5-aarch64.tgz and b/prebuilt/docker-20.10.5-arm.tgz differ