Add file service and socket for docker

dockzen-launcher separate the part that starts docker engine.
So, added file service and socket for docker engine.
And docker engine will be managed by systemd.

Signed-off-by: sy1124.kim <sy1124.kim@samsung.com>
Change-Id: I4db155b5428c4f09a798e99d0e8ed8b9ea3291e5

diff --git a/packaging/docker-engine.service b/packaging/docker-engine.service
new file mode 100644 (file)
index 0000000..8c95522
--- /dev/null
+++ b/packaging/docker-engine.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Docker Application Container Engine
+After=connman.service dbus.socket
+
+[Service]
+SmackProcessLabel=System
+Type=simple
+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
+RestartSec=0
+
+[Install]
+WantedBy=multi-user.target

diff --git a/packaging/docker-engine.socket b/packaging/docker-engine.socket
new file mode 100644 (file)
index 0000000..0145ab3
--- /dev/null
+++ b/packaging/docker-engine.socket
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Socket for the API
+PartOf=docker-engine.service
+
+[Socket]
+ListenStream=/run/docker.sock
+SocketMode=0777
+SocketUser=root
+SmackLabelIPIn=*
+SmackLabelIPOut=@
+
+[Install]
+WantedBy=sockets.target

diff --git a/packaging/docker-engine.spec b/packaging/docker-engine.spec
index 68fa79a..1bf12c4 100755 (executable)
--- a/packaging/docker-engine.spec
+++ b/packaging/docker-engine.spec
@@ -14,6 +14,8 @@ License: ASL 2.0
 ExclusiveArch: armv7l
 Source0: %{name}.tar.gz
 Source1: %{name}.manifest
+Source2: %{name}.service
+Source3: %{name}.socket
 Source11: go1.8.3.linux-amd64.tar.gz
 Source12: go1.8.3.linux-armv7.tar.gz
 Source13: docker-ce.tar.bz2
@@ -83,6 +85,9 @@ cd ../runc/
 mv `ls . | grep -v packaging | grep -v src` ../..%runc_path/runc
 cd ../../
 
+## service
+cp %{SOURCE2} ./%{name}.services
+cp %{SOURCE3} ./%{name}.socket
 
 %build
 cd .%docker_path/engine
@@ -121,6 +126,12 @@ install -p -m 755 .%runc_path/runc/runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc
 install -p -m 755 .%container_path/containerd/bin/containerd $RPM_BUILD_ROOT/%{_bindir}/docker-containerd
 install -p -m 755 .%container_path/containerd/bin/containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim
 install -p -m 755 .%container_path/containerd/bin/ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr
+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/
 
 %files
 %manifest %{name}.manifest
@@ -131,4 +142,8 @@ install -p -m 755 .%container_path/containerd/bin/ctr $RPM_BUILD_ROOT/%{_bindir}
 /%{_bindir}/docker-containerd-shim
 /%{_bindir}/docker-containerd-ctr
 /%{_bindir}/docker-runc
+/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
 %license .%docker_path/engine/LICENSE