commit b63eba42a29b39b9900cde069c3b8314f8e16636
Author: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
Date: Thu Oct 9 11:43:42 2014 -0500
Resolves: rhbz#1149882
NVR: docker-io-1.2.0-5
Signed-off-by: Lokesh Mandvekar <lsm5(a)fedoraproject.org>
modified: docker-io.spec
modified: docker.service
new file: docker.socket
docker-io.spec | 8 ++++++--
docker.service | 2 +-
docker.socket | 12 ++++++++++++
3 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/docker-io.spec b/docker-io.spec
index e9b9e3c..c2677c8 100644
--- a/docker-io.spec
+++ b/docker-io.spec
@@ -15,7 +15,7 @@
Name: %{repo}-io
Version: 1.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Automates deployment of containerized applications
License: ASL 2.0
URL:
http://www.docker.com
@@ -25,6 +25,7 @@ Source0: https://%{import_path}/archive/v%{version}.tar.gz
Source1: %{repo}.service
Source2: %{repo}.sysconfig
Source3: %{repo}-storage.sysconfig
+Source4: %{repo}.socket
Patch0: ignore-selinux-if-disabled.patch
# though final name for sysconf/sysvinit files is simply 'docker',
# having .sysvinit and .sysconfig makes things clear
@@ -231,7 +232,7 @@ install -d %{buildroot}%{_sharedstatedir}/%{repo}
# install systemd/init scripts
install -d %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.socket %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE4} %{buildroot}%{_unitdir}
# for additional args
install -d %{buildroot}%{_sysconfdir}/sysconfig/
@@ -465,6 +466,9 @@ exit 0
%{gopath}/src/%{import_path}/pkg/version/*.go
%changelog
+* Wed Oct 08 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-5
+- Resolves: rhbz#1149882 - systemd unit and socket file updates
+
* Tue Sep 30 2014 Lokesh Mandvekar <lsm5(a)fedoraproject.org> - 1.2.0-4
- Resolves: rhbz#1139415 - correct path for bash completion
/usr/share/bash-completion/completions
diff --git a/docker.service b/docker.service
index 100e824..10c7e15 100644
--- a/docker.service
+++ b/docker.service
@@ -13,4 +13,4 @@ LimitNOFILE=1048576
LimitNPROC=1048576
[Install]
-Also=docker.socket
+WantedBy=multi-user.target
diff --git a/docker.socket b/docker.socket
new file mode 100644
index 0000000..7dd9509
--- /dev/null
+++ b/docker.socket
@@ -0,0 +1,12 @@
+[Unit]
+Description=Docker Socket for the API
+PartOf=docker.service
+
+[Socket]
+ListenStream=/var/run/docker.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=docker
+
+[Install]
+WantedBy=sockets.target