From e030935ffec1f8cc8fae2d71b398f4695160fd60 Mon Sep 17 00:00:00 2001 From: Stas Fomin Date: Mon, 11 Sep 2017 14:55:13 +0300 Subject: [PATCH] Up to 17 and tested --- adjust-docker-service.patch | 17 +++++++++++++++++ docker.conf | 11 +++++++++++ 2 files changed, 28 insertions(+) create mode 100644 adjust-docker-service.patch create mode 100644 docker.conf diff --git a/adjust-docker-service.patch b/adjust-docker-service.patch new file mode 100644 index 0000000..ee3bf9a --- /dev/null +++ b/adjust-docker-service.patch @@ -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. diff --git a/docker.conf b/docker.conf new file mode 100644 index 0000000..6c4d3db --- /dev/null +++ b/docker.conf @@ -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"