add docker 19.03.5

Change-Id: Ia65afd96ab9d94db80a0478e7275969e58c16f17
Signed-off-by: Semun Lee <semun.lee@samsung.com>

diff --git a/packaging/docker-19.03.5.tgz b/packaging/docker-19.03.5.tgz
new file mode 100644 (file)
index 0000000..b35936f
Binary files /dev/null and b/packaging/docker-19.03.5.tgz differ

diff --git a/packaging/docker-engine.manifest b/packaging/docker-engine.manifest
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/docker-engine.service b/packaging/docker-engine.service
index a43ddb8..95edec5 100644 (file)
--- a/packaging/docker-engine.service
+++ b/packaging/docker-engine.service
@@ -3,7 +3,7 @@ Description=Docker Application Container Engine
 After=connman.service dbus.socket
 
 [Service]
-SmackProcessLabel=System
+SmackProcessLabel=System::Privileged
 ExecStart=/usr/bin/dockerd -s overlay2 --userland-proxy=false -H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375
 Sockets=docker-engine.socket
 Restart=always

diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec
old mode 100755 (executable)
new mode 100644 (file)
index 047607a..75db3f8
--- a/packaging/docker-engine.spec
+++ b/packaging/docker-engine.spec
@@ -1,8 +1,5 @@
-%define go_version 1.8.3
-%define orig_version 17.06.0-dev
-
 Name: docker-engine
-Version: 0.7.0
+Version: 19.03.5
 Release: 0
 Summary: The open-source application container engine
 Group: Tools/Docker
@@ -13,7 +10,7 @@ Source0: %{name}.tar.gz
 Source1: %{name}.manifest
 Source2: %{name}.service
 Source3: %{name}.socket
-Source11: docker-engine.tar.bz2
+Source12: docker-19.03.5.tgz
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -30,6 +27,8 @@ language, framework or packaging system. That makes them great building blocks
 for deploying and scaling web apps, databases, and backend services without
 depending on a particular stack or provider.
 
+Prebuilt binaries are download from https://download.docker.com/linux/static/stable/armel/
+
 
 %prep
 %setup -q
@@ -37,11 +36,9 @@ depending on a particular stack or provider.
 chmod g-w %_sourcedir/*
 cp %{SOURCE1} ./%{name}.manifest
 
-# docker-engine tar file
-cp %{SOURCE11} .
-tar -xvf %{SOURCE11}
+cp %{SOURCE12} .
+tar -xvf %{SOURCE12}
 
-## service
 cp %{SOURCE2} ./%{name}.services
 cp %{SOURCE3} ./%{name}.socket
 
@@ -49,19 +46,25 @@ cp %{SOURCE3} ./%{name}.socket
 rm -rf %{buildroot}
 # install binary
 install -d $RPM_BUILD_ROOT/%{_bindir}
-install -p -m 755 ./docker-engine/docker $RPM_BUILD_ROOT/%{_bindir}/docker
+install -p -m 755 ./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
+install -m 0644 %SOURCE2 %{buildroot}/usr/lib/systemd/system/%{name}.service
+ln -s ../%{name}.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/
+install -m 0644 %SOURCE3 %{buildroot}/usr/lib/systemd/system/%{name}.socket
+ln -s ../%{name}.socket %{buildroot}/usr/lib/systemd/system/sockets.target.wants/
 
 %post
-ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-containerd
-ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr
-ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim
-ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-proxy
-ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/docker-runc
-ln -sf docker $RPM_BUILD_ROOT/%{_bindir}/dockerd
-
+ln -s /opt/etc/docker /etc/docker
 
 %files
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-/%{_bindir}/docker*
+/%{_bindir}/*
 %license ./LICENSE
+/opt/etc/docker
+/usr/lib/systemd/system/%{name}.service
+/usr/lib/systemd/system/multi-user.target.wants/%{name}.service
+/usr/lib/systemd/system/%{name}.socket
+/usr/lib/systemd/system/sockets.target.wants/%{name}.socket

diff --git a/packaging/docker-engine.tar.bz2 b/packaging/docker-engine.tar.bz2
deleted file mode 100644 (file)
index c111b51..0000000
Binary files a/packaging/docker-engine.tar.bz2 and /dev/null differ