69 lines
2.4 KiB
Diff
69 lines
2.4 KiB
Diff
From 67f1bfcb1df53fcfc044927eda37f0f8b45498dc Mon Sep 17 00:00:00 2001
|
|
From: lujingxiao <lujingxiao@huawei.com>
|
|
Date: Mon, 21 Jan 2019 22:25:42 +0800
|
|
Subject: [PATCH 073/111] service: update docker.service with old
|
|
revision
|
|
|
|
reason: use docker.service as the same one used in Euleros docker
|
|
1.11.2 and 17.06
|
|
|
|
Change-Id: I3deb3f3a24d837c98e535550545fd49ea0822629
|
|
Signed-off-by: lujingxiao <lujingxiao@huawei.com>
|
|
---
|
|
.../contrib/init/systemd/docker.service | 28 ++++++++-----------
|
|
1 file changed, 11 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/components/engine/contrib/init/systemd/docker.service b/components/engine/contrib/init/systemd/docker.service
|
|
index 517463172b..26c0fe648b 100644
|
|
--- a/components/engine/contrib/init/systemd/docker.service
|
|
+++ b/components/engine/contrib/init/systemd/docker.service
|
|
@@ -1,34 +1,28 @@
|
|
[Unit]
|
|
Description=Docker Application Container Engine
|
|
Documentation=https://docs.docker.com
|
|
-After=network-online.target docker.socket firewalld.service
|
|
+After=network-online.target 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://
|
|
+EnvironmentFile=-/etc/sysconfig/docker
|
|
+EnvironmentFile=-/etc/sysconfig/docker-storage
|
|
+EnvironmentFile=-/etc/sysconfig/docker-network
|
|
+Environment=GOTRACEBACK=crash
|
|
+
|
|
+ExecStart=/usr/bin/dockerd $OPTIONS \
|
|
+ $DOCKER_STORAGE_OPTIONS \
|
|
+ $DOCKER_NETWORK_OPTIONS \
|
|
+ $INSECURE_REGISTRY
|
|
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
|
|
+LimitNPROC=1048576
|
|
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
|
|
--
|
|
2.17.1
|
|
|