This seems a bug with the docker.service unit file; the unit is missing:

          --containerd /run/containerd.sock \

Lokesh, can you check this one?

We could also ship /usr/libexec/docker/docker-containerd and have it figure out which docker-container-* to link with.

(In reply to Daniel Walsh from comment #10)
> We could also ship /usr/libexec/docker/docker-containerd and have it figure
> out which docker-container-* to link with.

that's fine - we still need a patch in docker to specify the containerd path (or add /usr/libexec/docker in $PATH which I wouldn't...)

I thought docker execs /usr/libexec/docker/docker-containerd if containerd is not running?  Or does it look for /usr/bin/docker-containerd?

(In reply to Daniel Walsh from comment #12)
> I thought docker execs /usr/libexec/docker/docker-containerd if containerd
> is not running?  Or does it look for /usr/bin/docker-containerd?

it looks for $PATH/docker-containerd

Ok we ship /usr/bin/docker-containerd with the same logic that /usr/bin/docker has to find /usr/libexec/docker/docker-containerd-*

Same for runc.

(In reply to Daniel Walsh from comment #14)
> Ok we ship /usr/bin/docker-containerd with the same logic that
> /usr/bin/docker has to find /usr/libexec/docker/docker-containerd-*
> 
> Same for runc.

Dan, something like this would work according to my testing on F25:

$ cat docker-containerd-common.sh                     
#!/bin/sh
. /etc/sysconfig/docker
[ -e "${DOCKER_CONTAINERD_BINARY}" ] || DOCKER_CONTAINERD_BINARY=/usr/bin/docker-containerd-current
if [ ! -f /usr/bin/docker-containerd-current ]; then
    DOCKER_CONTAINERD_BINARY=/usr/bin/docker-containerd-latest
fi
if [[ ${DOCKER_CONTAINERD_BINARY} != "/usr/bin/docker-containerd-current" && ${DOCKER_CONTAINERD_BINARY} != /usr/bin/docker-containerd-latest ]]; then
    echo "DOCKER_CONTAINERD_BINARY has been set to an invalid value:" $DOCKER_CONTAINERD_BINARY
    echo ""
    echo "Please set DOCKERBINARY to /usr/bin/docker-containerd-current or /usr/bin/docker-containerd-latest
by editing /etc/sysconfig/docker"
else
    exec ${DOCKER_CONTAINERD_BINARY} "$@"
fi

Dan, does this fix (no containerd own service unit) need to be done in Fedora as well? or is this just for RHEL?

No just RHEL.

Also, if you get dockerd running (via symlinking docker-containerd -> docker-containerd-current), running docker yields:

    /usr/bin/docker: line 13: /usr/bin/docker-latest: No such file or directory

root cause: /usr/bin/docker first looks for docker-current, which doesn't exist.

Have you run rpmdiff against this? I suspect rpmdiff might find more problems.

FAILS_QA with docker-common-1.12.5-3.el7.x86_64: bug 1405989.

(In reply to Ed Santiago from comment #20)
> Also, if you get dockerd running (via symlinking docker-containerd ->
> docker-containerd-current), running docker yields:
> 
>     /usr/bin/docker: line 13: /usr/bin/docker-latest: No such file or
> directory
> 
> root cause: /usr/bin/docker first looks for docker-current, which doesn't
> exist.
> 
> Have you run rpmdiff against this? I suspect rpmdiff might find more
> problems.

I have fixed this in docker-common.sh with a friendlier error message. I'll see what rpmdiff says.

Works well in docker-1.12.5-9.el7.x86_64 , move to verified

Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.

For information on the advisory, and where to find the updated
files, follow the link below.

If the solution does not work for you, open a new bug report.

https://rhn.redhat.com/errata/RHSA-2017-0116.html