From bbd710de1c9ade5248e381cfb06d0f2d5f5053e9 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Sat, 22 Jun 2019 18:25:10 +0100 Subject: [PATCH] debian-dockerd-binary-location Gbp-Pq: Name debian-dockerd-binary-location.patch --- engine/contrib/init/systemd/docker.service | 2 +- engine/contrib/init/sysvinit-debian/docker | 2 +- engine/contrib/init/upstart/docker.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/contrib/init/systemd/docker.service b/engine/contrib/init/systemd/docker.service index 0d7b4472..6d6f8976 100644 --- a/engine/contrib/init/systemd/docker.service +++ b/engine/contrib/init/systemd/docker.service @@ -11,7 +11,7 @@ Type=notify # exists and systemd currently does not support the cgroup feature set required # for containers run by docker EnvironmentFile=-/etc/default/docker -ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS +ExecStart=/usr/sbin/dockerd -H fd:// $DOCKER_OPTS ExecReload=/bin/kill -s HUP $MAINPID LimitNOFILE=1048576 # Having non-zero Limit*s causes performance problems due to accounting overhead diff --git a/engine/contrib/init/sysvinit-debian/docker b/engine/contrib/init/sysvinit-debian/docker index 9c8fa6be..4d7cbd7c 100755 --- a/engine/contrib/init/sysvinit-debian/docker +++ b/engine/contrib/init/sysvinit-debian/docker @@ -22,7 +22,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin BASE=docker # modify these in /etc/default/$BASE (/etc/default/docker) -DOCKERD=/usr/bin/dockerd +DOCKERD=/usr/sbin/dockerd # This is the pid file managed by docker itself DOCKER_PIDFILE=/var/run/$BASE.pid # This is the pid file created/managed by start-stop-daemon diff --git a/engine/contrib/init/upstart/docker.conf b/engine/contrib/init/upstart/docker.conf index d58f7d6a..71978b6c 100644 --- a/engine/contrib/init/upstart/docker.conf +++ b/engine/contrib/init/upstart/docker.conf @@ -38,7 +38,7 @@ end script script # modify these in /etc/default/$UPSTART_JOB (/etc/default/docker) - DOCKERD=/usr/bin/dockerd + DOCKERD=/usr/sbin/dockerd DOCKER_OPTS= if [ -f /etc/default/$UPSTART_JOB ]; then . /etc/default/$UPSTART_JOB -- 2.30.2