Accepting request 447279 from home:cyphar:containers

Remove socket activation from Docker, to match upstream.

OBS-URL: https://build.opensuse.org/request/show/447279
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=159

docker.service

@@ -1,21 +1,16 @@
 [Unit]
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
-After=network.target docker.socket containerd.socket
-Requires=docker.socket containerd.socket
+After=network.target containerd.socket
+Requires=containerd.socket
 
 [Service]
 EnvironmentFile=/etc/sysconfig/docker
 
-# Quick rundown of options, so we can keep track of them. Upstream's
-# service file only contains -H.
-#
-# * -H tells Docker that it's running as a socket-activated service.
-# * --containerd tells Docker to not manage the running of containerd.
-# * --add-runtime and --default-runtime tell Docker to not try to use
-#   its "bundled" runC version (which is not shipped by us) but rather use
-#   the runC version provided as by the runc package.
-ExecStart=/usr/bin/dockerd -H fd:// --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/sbin/runc --default-runtime oci $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
+# While Docker has support for socket activation (-H fd://), this is not
+# enabled by default because enabling socket activation means that on boot your
+# containers won't start until someone tries to administer the Docker daemon.
+ExecStart=/usr/bin/dockerd $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
 ExecReload=/bin/kill -s HUP $MAINPID
 
 # Having non-zero Limit*s causes performance problems due to accounting overhead
@@ -32,7 +27,7 @@ LimitCORE=infinity
 # Only systemd 218 and above support this property.
 #Delegate=yes
 
-# Tis is not necessary because of how we set up containerd.
+# This is not necessary because of how we set up containerd.
 #KillMode=process
 
 [Install]