github.com/kaisenlinux/docker.io@v0.0.0-20230510090727-ea55db55fac7/debian/patches/debian-dockerd-binary-location.patch (about)

     1  Forwarded: not-needed
     2  Description: FHS compliance.
     3  
     4  Index: docker/engine/contrib/init/systemd/docker.service
     5  ===================================================================
     6  --- docker.orig/engine/contrib/init/systemd/docker.service
     7  +++ docker/engine/contrib/init/systemd/docker.service
     8  @@ -11,7 +11,7 @@ Type=notify
     9   # exists and systemd currently does not support the cgroup feature set required
    10   # for containers run by docker
    11   EnvironmentFile=-/etc/default/docker
    12  -ExecStart=/usr/bin/dockerd -H fd:// $DOCKER_OPTS
    13  +ExecStart=/usr/sbin/dockerd -H fd:// $DOCKER_OPTS
    14   ExecReload=/bin/kill -s HUP $MAINPID
    15   LimitNOFILE=1048576
    16   # Having non-zero Limit*s causes performance problems due to accounting overhead
    17  Index: docker/engine/contrib/init/sysvinit-debian/docker
    18  ===================================================================
    19  --- docker.orig/engine/contrib/init/sysvinit-debian/docker
    20  +++ docker/engine/contrib/init/sysvinit-debian/docker
    21  @@ -22,7 +22,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bi
    22   BASE=docker
    23   
    24   # modify these in /etc/default/$BASE (/etc/default/docker)
    25  -DOCKERD=/usr/bin/dockerd
    26  +DOCKERD=/usr/sbin/dockerd
    27   # This is the pid file managed by docker itself
    28   DOCKER_PIDFILE=/var/run/$BASE.pid
    29   # This is the pid file created/managed by start-stop-daemon
    30  Index: docker/engine/contrib/init/upstart/docker.conf
    31  ===================================================================
    32  --- docker.orig/engine/contrib/init/upstart/docker.conf
    33  +++ docker/engine/contrib/init/upstart/docker.conf
    34  @@ -38,7 +38,7 @@ end script
    35   
    36   script
    37   	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
    38  -	DOCKERD=/usr/bin/dockerd
    39  +	DOCKERD=/usr/sbin/dockerd
    40   	DOCKER_OPTS=
    41   	if [ -f /etc/default/$UPSTART_JOB ]; then
    42   		. /etc/default/$UPSTART_JOB