[packages/lxc-docker] Add systemd unit

aredridel aredridel at pld-linux.org
Fri Nov 29 01:48:23 CET 2013


commit c74634f7401acca5ac1a1d904433711c17e82685
Author: Aria Stewart <aredridel at nbtsc.org>
Date:   Thu Nov 28 17:48:06 2013 -0700

    Add systemd unit

 lxc-docker.service | 13 +++++++++++++
 lxc-docker.spec    |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/lxc-docker.spec b/lxc-docker.spec
index 0086ee2..bea1f81 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -10,6 +10,7 @@ License:	Apache v2.0
 Group:		Applications/System
 Source0:	https://github.com/dotcloud/docker/archive/v%{version}/docker-%{version}.tar.gz
 # Source0-md5:	bc5e2aa1fbcd3ab8fac1a4f6a4613a16
+Source5:	%{name}.service
 Source6:	%{name}.init
 URL:		http://github.com/dotcloud/docker
 BuildRequires:	device-mapper-devel
@@ -102,9 +103,10 @@ go build -v -ldflags "$LDFLAGS" -a ../dockerinit/dockerinit.go
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,/var/lib/docker/{containers,graph,volumes}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/rc.d/init.d,%{systemdunitdir},/var/lib/docker/{containers,graph,volumes}}
 install -p build/docker $RPM_BUILD_ROOT%{_bindir}/lxc-docker
 install -p build/dockerinit $RPM_BUILD_ROOT%{_bindir}/dockerinit
+install -p %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/lxc-docker.service
 install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/lxc-docker
 ln -s lxc-docker $RPM_BUILD_ROOT%{_bindir}/docker
 #cp -p packaging/debian/lxc-docker.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -143,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md CHANGELOG.md CONTRIBUTING.md FIXME LICENSE AUTHORS NOTICE MAINTAINERS
+%attr(644,root,root) %{systemdunitdir}/lxc-docker.service
 %attr(754,root,root) /etc/rc.d/init.d/lxc-docker
 %attr(755,root,root) %{_bindir}/lxc-docker
 %attr(755,root,root) %{_bindir}/docker
diff --git a/lxc-docker.service b/lxc-docker.service
new file mode 100644
index 0000000..42ce05d
--- /dev/null
+++ b/lxc-docker.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+Requires=network.target
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+ExecStartPre=/bin/mount --make-rprivate /
+ExecStart=/usr/bin/docker -d
+
+[Install]
+WantedBy=multi-user.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lxc-docker.git/commitdiff/4bdd36620ffadff0f9969d7a3702cd5025091668



More information about the pld-cvs-commit mailing list