[docker-io/f19] set mode,user,group in docker.socket file
Lokesh Mandvekar
lsm5 at fedoraproject.org
Wed Jun 25 05:13:37 UTC 2014
commit 7939c76bca78171c44c00517cd00b9478d802ffb
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Tue Jun 24 23:55:15 2014 -0500
set mode,user,group in docker.socket file
docker-io.spec | 8 ++++++--
docker.socket | 11 +++++++++++
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index 19282cd..52346cb 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -10,7 +10,7 @@
Name: docker-io
Version: 1.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
Patch1: upstream-patched-archive-tar.patch
@@ -21,6 +21,7 @@ ExclusiveArch: x86_64
Source0: https://github.com/dotcloud/docker/archive/v%{version}.tar.gz
Source1: docker.service
Source2: docker.sysconfig
+Source3: docker.socket
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
BuildRequires: gcc
@@ -117,7 +118,7 @@ install -d -m 700 %{buildroot}%{_sharedstatedir}/docker
install -d %{buildroot}%{_unitdir}
#install -p -m 644 contrib/init/systemd/docker.service %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/socket-activation/docker.socket %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE3} %{buildroot}%{_unitdir}
# for additional args
install -d %{buildroot}%{_sysconfdir}/sysconfig/
install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/docker
@@ -161,6 +162,9 @@ exit 0
%{_datadir}/vim/vimfiles/syntax/dockerfile.vim
%changelog
+* Tue Jun 24 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.0.0-4
+- Set mode,user,group in docker.socket file
+
* Sat Jun 14 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 1.0.0-3
- correct bogus date
diff --git a/docker.socket b/docker.socket
new file mode 100644
index 0000000..9db5049
--- /dev/null
+++ b/docker.socket
@@ -0,0 +1,11 @@
+[Unit]
+Description=Docker Socket for the API
+
+[Socket]
+ListenStream=/var/run/docker.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=docker
+
+[Install]
+WantedBy=sockets.target
More information about the scm-commits
mailing list