I just finished packaging 20.10.0~rc1. It's still a WIP, but good enough
for upload to experimental. The package should be available in experimental
soon. Here are some links:

- <https://salsa.debian.org/docker-team/docker/-/tree/experimental>
- <
https://buildd.debian.org/status/package.php?p=docker.io&suite=experimental>

@Shengjing: For now the package still embeds containerd, as was the case
with docker.io 19.03.x. However it would be nice to remove this copy of
containerd from docker.io.

At the moment, here is the situation:
- Docker 20.10.0-rc1 "upstream" builds against containerd d4e7820, which is
somewhere on the MASTER branch after v1.4.0 (so it's NOT on the 1.4 branch).
- The package I prepared for Debian is built against containerd v1.4.1
though, as I want to use a stable version of containerd.
- In order to build against containerd v1.4.1, I needed to backport 3
patches from the master branch, see:
https://salsa.debian.org/docker-team/docker/-/commit/da70c7e
- These patches are needed to fix a FTBFS in moby/buildkit, which is a
(vendored) build depend of docker

So at the moment, if I want to COMPLETELY remove containerd from docker.io,
it means that either:
- containerd needs to backport these 3 patches, just so that docker.io can
build
- OR find a better solution (for example, revert patches in moby/buildkit
so that it can build against old containerd v1.4, but no, I tried, I don't
think it can work)

If we go for this solution, I think that:
- it can work for debian bullseye (ie. stable), because after it's released
nothing will change much
- however for debian unstable, I think it could be trouble. Containerd 1.5
will be released, then 1.6, and docker.io will lag behind and maybe require
more and more patching to build (unless containerd is very good at
preserving backward compatibility).

There is also another solution, a bit in the middle: docker.io keeps a
vendor copy of containerd (so that docker.io can patch its copy of
containerd as needed), but it uses this copy only for build time. For
runtime, docker can depend on the containerd package from Debian.

My proposition would be:
- try to completely remove containerd from docker.io for now, so that it's
nice and clean for debian stable
- then during maintenance in debian unstable, if it becomes too much of a
mess, revert to vendoring containerd in docker.io, but only as a build dep

What do you think of that ? Would you mind looking at
https://salsa.debian.org/docker-team/docker/-/commit/da70c7e, and tell me
if that makes sense to apply these patches in containerd ? Or do you have a
better idea ?

(( Of course, this assumes that there will be a docker v20.10 stable
release in time for Bullseye... ))

Cheers,

  Arnaud



On Thu, Nov 19, 2020 at 10:57 AM Shengjing Zhu <z...@debian.org> wrote:

> 20.10 is still in beta, so it shouldn't be candidate for bullseye. But if
> they release the stable version before bullseye freeze, maybe we should
> update.
>
> Regarding cgroupv2, systemd maintainer has proposed to switch to cgroupv2
> by default 1year ago. Please see #943981. It seems docker is the only
> blocker now.
>
> // send from my mobile device
>
> El boulangero <elboulang...@gmail.com> 于 2020年11月19日周四 11:24写道:
>
>> Hi Shengjing,
>>
>> thanks for the message. I agree that we should start packaging docker
>> 20.10.x in experimental.
>>
>> Regarding docker 19.03.x: do you know if it will work at all in bullseye?
>> Right now it works for me, running Debian unstable. I guess it's because
>> both cgroup interfaces are available:
>>
>>   $ grep cgroup /proc/filesystems
>>   nodev cgroup
>>   nodev cgroup2
>>
>> Do you know if Bullseye will ship with both cgroup? Hence docker 19.03.x
>> will work?
>>
>> Personally I would be in favor of sticking to the Docker branch 19.03 for
>> bullseye, rather than shipping a beta that will then never be updated to
>> later point releases, due to Debian policy for the stable suite.
>>
>>
>>
>> On Sun, Nov 15, 2020 at 11:09 PM Shengjing Zhu <z...@debian.org> wrote:
>>
>>> Package: docker.io
>>> Version: 19.03.13+dfsg1-3
>>> Severity: wishlist
>>> X-Debbugs-Cc: z...@debian.org
>>>
>>> Hi,
>>>
>>> docker has released 20.10.0-beta1 for a while. Not sure the plan for
>>> stable
>>> release.
>>>
>>> But if we want 20.10 in bullseye, I suggest starting to package
>>> 20.10.0-beta1
>>> and upload to experimental. So people have time to test.
>>>
>>> A big improvement in 20.10 is supporting cgroupv2.
>>>
>>> https://github.com/docker/docker-ce/blob/master/VERSION
>>> https://github.com/moby/moby/releases/tag/v20.10.0-beta1
>>> https://github.com/docker/docker-ce/blob/master/CHANGELOG.md
>>>
>>

Reply via email to