[Lunar-commits] <moonbase-other> Merge branch 'master' of github.com:lunar-linux/moonbase-other

[Dennis Veatch]

commit 07bfd92f78a7b2307b3f5d492dbbd0d55ce01504
Author: Dennis Veatch <dennisveatch at bellsouth.net>
Date: Sun, 26 Oct 2014 12:27:24 -0400
URL: https://github.com/lunar-linux/moonbase-other/commit/07bfd92f78a7b2307b3f5d492dbbd0d55ce01504

Merge branch 'master' of github.com:lunar-linux/moonbase-other
---
  virtual/docker/BUILD                    | +3/-0     
  virtual/docker/systemd.d/docker.service | +4/-3     
  virtual/docker/systemd.d/docker.socket  | +12/-0    
  3 files changed, 19 insertions(+), 3 deletions(-)

--- a/virtual/docker/BUILD
+++ b/virtual/docker/BUILD
@@ -1,5 +1,8 @@
 export AUTO_GOPATH=1
 export DOCKER_GITCOMMIT
+
+add_priv_group docker &&
+
 ./hack/make.sh dynbinary &&
 prepare_install &&
 install -Dm0755 bundles/${VERSION}/dynbinary/docker-${VERSION} /usr/bin/docker &&
--- a/virtual/docker/systemd.d/docker.service
+++ b/virtual/docker/systemd.d/docker.service
@@ -1,11 +1,12 @@
 [Unit]
 Description=Docker Application Container Engine
-Documentation=http://docs.docker.io
-After=network.target
+Documentation=http://docs.docker.com
+After=network.target docker.socket
+Requires=docker.socket
 
 [Service]
-ExecStart=/usr/bin/docker -d
 Restart=on-failure
+ExecStart=/usr/bin/docker -d -H fd://
 LimitNOFILE=1048576
 LimitNPROC=1048576
 
--- /dev/null
+++ b/virtual/docker/systemd.d/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