Explorar el Código

Merge pull request #273 from seemethere/sockles

Add socket activation for RHEL based distributions
Andrew Hsu hace 6 años
padre
commit
a9a8ec7c09
Se han modificado 2 ficheros con 1 adiciones y 8 borrados
  1. 1 1
      contrib/init/systemd/docker.service
  2. 0 7
      systemd/00-socket-activation.conf

+ 1 - 1
contrib/init/systemd/docker.service

@@ -10,7 +10,7 @@ Type=notify
 # the default is not to use systemd for cgroups because the delegate issues still
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
 # for containers run by docker
-ExecStart=/usr/bin/dockerd
+ExecStart=/usr/bin/dockerd -H fd://
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecReload=/bin/kill -s HUP $MAINPID
 TimeoutSec=0
 TimeoutSec=0
 RestartSec=2
 RestartSec=2

+ 0 - 7
systemd/00-socket-activation.conf

@@ -1,7 +0,0 @@
-[Unit]
-After=docker.socket
-Requires=docker.socket
-
-[Service]
-ExecStart=
-ExecStart=/usr/bin/dockerd -H fd://