From b8bcf7005c569aa20054b59cb7807a82451cc141 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 6 Jun 2017 14:56:39 -0700 Subject: [PATCH] Use internal systemd scripts for DEB packaging Signed-off-by: Eli Uriegas --- contrib/init/systemd/docker.service | 34 ----------------------------- contrib/init/systemd/docker.socket | 12 ---------- 2 files changed, 46 deletions(-) delete mode 100644 contrib/init/systemd/docker.service delete mode 100644 contrib/init/systemd/docker.socket diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service deleted file mode 100644 index 517463172b..0000000000 --- a/contrib/init/systemd/docker.service +++ /dev/null @@ -1,34 +0,0 @@ -[Unit] -Description=Docker Application Container Engine -Documentation=https://docs.docker.com -After=network-online.target docker.socket firewalld.service -Wants=network-online.target -Requires=docker.socket - -[Service] -Type=notify -# 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 -# for containers run by docker -ExecStart=/usr/bin/dockerd -H fd:// -ExecReload=/bin/kill -s HUP $MAINPID -LimitNOFILE=1048576 -# Having non-zero Limit*s causes performance problems due to accounting overhead -# in the kernel. We recommend using cgroups to do container-local accounting. -LimitNPROC=infinity -LimitCORE=infinity -# Uncomment TasksMax if your systemd version supports it. -# Only systemd 226 and above support this version. -#TasksMax=infinity -TimeoutStartSec=0 -# set delegate yes so that systemd does not reset the cgroups of docker containers -Delegate=yes -# kill only the docker process, not all processes in the cgroup -KillMode=process -# restart the docker process if it exits prematurely -Restart=on-failure -StartLimitBurst=3 -StartLimitInterval=60s - -[Install] -WantedBy=multi-user.target diff --git a/contrib/init/systemd/docker.socket b/contrib/init/systemd/docker.socket deleted file mode 100644 index 7dd95098e4..0000000000 --- a/contrib/init/systemd/docker.socket +++ /dev/null @@ -1,12 +0,0 @@ -[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