Remove 'docker-' prefix for containerd and runc binaries

[tiborvass]

This allows to run the daemon in environments that have upstream containerd installed.

Signed-off-by: Tibor Vass tibor@docker.com

[codecov]

Codecov Report

Merging #37907 into master will decrease coverage by 0.01%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master   #37907      +/-   ##
==========================================
- Coverage    36.1%   36.09%   -0.02%     
==========================================
  Files         610      610              
  Lines       45115    45121       +6     
==========================================
- Hits        16291    16288       -3     
- Misses      26584    26593       +9     
  Partials     2240     2240

[seemethere]

LGTM

[vdemeester]

LGTM 👼

[yongtang]

LGTM

[AkihiroSuda]

I'm wondering this might cause packaging issues.
e.g. apt/dnf-installing both docker-ce and runc is no longer possible?

[thaJeztah]

ping @seemethere ^^

[seemethere]

docker-ce doesn't install runc anymore our containerd package does. But yeah our containerd package would essentially overwrite the runc binary installed with the runc distro provided package. Original intention was to have a docker distributed runc package as well but that probably won't happen until late Q4 for us.

[cyphar]

This is a very bad idea -- Docker has always been stuck on an older version of runc and now we have to do workarounds in order to be able to split the two in the distribution (because, for instance, cri-o uses a newer version).

There is no workaround for this change either! --default-runtime doesn't help because it saves the runtime in the RuntimeConfig (which then causes container to not be able to start on a daemon reboot where the runtime is no longer defined -- we found this out the hard way).

Speaking on the openSUSE side of things, we will carry a revert of this patch.

But yeah our containerd package would essentially overwrite the runc binary installed with the runc distro provided package.

This is not a good practice when packaging (and distributions won't accept such packages), not to mention that attempting to install such packages on most distributions will result in warnings due to file conflicts between packages.

[lifubang]

Yes, it is. Another issue: When I use my own default containerd to start docker, once I kill containerd, then restart dockerd, dockerd will start his own contanerd, then the old containerd-shim is not stopped, and another containerd-shim is started, there are two containerd-shim for one container.