Up to 17 and tested

This commit is contained in:
Stas Fomin 2017-09-11 14:55:13 +03:00
parent a090917f7e
commit e030935ffe
2 changed files with 28 additions and 0 deletions

View file

@ -0,0 +1,17 @@
diff --git a/contrib/init/systemd/docker.service.rpm b/contrib/init/systemd/docker.service.rpm
index 08e90da..b6ff8c7 100644
--- a/contrib/init/systemd/docker.service.rpm
+++ b/contrib/init/systemd/docker.service.rpm
@@ -5,10 +5,11 @@ After=network.target
[Service]
Type=notify
+EnvironmentFile=-/etc/sysconfig/docker
# 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
+ExecStart=/usr/bin/dockerd $DOCKER_OPTS $DATA_ROOT
ExecReload=/bin/kill -s HUP $MAINPID
# Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting.

11
docker.conf Normal file
View file

@ -0,0 +1,11 @@
# Use DOCKER_OPTS to modify the daemon startup options.
# DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
# set overlayfs if you need
DOCKER_OPTS="--storage-driver=overlay2"
DATA_ROOT="--data-root /var/lib/docker"
# If you need Docker to use an HTTP proxy, it can also be specified here.
#export http_proxy="http://127.0.0.1:3128/"
# This is also a handy place to tweak where Docker's temporary files go.
#export TMPDIR="/mnt/bigdrive/docker-tmp"