Merge ~lucaskanashiro/ubuntu/+source/docker.io:sru-docker-bionic into ubuntu/+source/docker.io:ubuntu/bionic-devel

[Lucas Kanashiro]

Backport the fix for the upgrade issue which makes the docker daemon stop, stopping also all the containers running.

PPA with the proposed package:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/containerd-upgrade-issue/+packages

DEP-8 tests are passing:

autopkgtest [17:34:03]: @@@@@@@@@@@@@@@@@@@@ summary
basic-smoke PASS
docker-in-lxd PASS

[Sergio Durigan Junior (sergiodj)]

LGTM.

I tried searching to see if there's a bug opened about the libbtrfs-dev, but couldn't find anything.

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Uploaded:

$ git push pkg upload/19.03.6-0ubuntu1_18.04.3
Enumerating objects: 26, done.
Counting objects: 100% (26/26), done.
Delta compression using up to 32 threads
Compressing objects: 100% (19/19), done.
Writing objects: 100% (19/19), 4.01 KiB | 1.34 MiB/s, done.
Total 19 (delta 11), reused 0 (delta 0)
To ssh://git.launchpad.net/ubuntu/+source/docker.io
 * [new tag] upload/19.03.6-0ubuntu1_18.04.3 -> upload/19.03.6-0ubuntu1_18.04.3
$ dput ubuntu ../docker.io_19.03.6-0ubuntu1~18.04.3_source.changes
Checking signature on .changes
gpg: ../docker.io_19.03.6-0ubuntu1~18.04.3_source.changes: Valid signature from F823A2729883C97C
Checking signature on .dsc
gpg: ../docker.io_19.03.6-0ubuntu1~18.04.3.dsc: Valid signature from F823A2729883C97C
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading docker.io_19.03.6-0ubuntu1~18.04.3.dsc: done.
  Uploading docker.io_19.03.6-0ubuntu1~18.04.3.debian.tar.xz: done.
  Uploading docker.io_19.03.6-0ubuntu1~18.04.3_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 3207706..e3d2a97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+docker.io (19.03.6-0ubuntu1~18.04.3) bionic; urgency=medium
+
+  [ Bryce Harrington ]
+  * d/p/do_not_bind_docker_to_containerd.patch: Update docker.io to not
+    stop when containerd is upgraded, by using Wants= rather than BindTo=.
+    (LP: #1870514)
+  * d/rules: Fix docker.io to not restart its service during package
+    upgrades, to prevent service downtime from automatic updates via
+    unattended-upgrade.
+    (LP: #1906364)
+
+  [ Lucas Kanashiro ]
+  * Do not build depend on libbtrfs-dev, it is not available in Bionic.
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 10 Dec 2020 10:23:49 -0300
+
 docker.io (19.03.6-0ubuntu1~18.04.2) bionic-security; urgency=medium
 
   * SECURITY UPDATE: Sensitive information disclosure
diff --git a/debian/control b/debian/control
index 14c81fb..d744b3c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: bash-completion,
                git,
                golang-any,
                libapparmor-dev,
-               libbtrfs-dev | btrfs-progs (<< 4.16.1~),
+               btrfs-progs (<< 4.16.1~),
                libdevmapper-dev (>= 2:1.02.68~),
                libltdl-dev,
                libseccomp-dev,
diff --git a/debian/patches/do-not-bind-docker-to-containerd.patch b/debian/patches/do-not-bind-docker-to-containerd.patch
new file mode 100644
index 0000000..d2202cc
--- /dev/null
+++ b/debian/patches/do-not-bind-docker-to-containerd.patch
@@ -0,0 +1,64 @@
+From 22f15d4137cb5d090f13fc5d9093dc3085dce67b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20Kosek?= <[e-mail]>
+Date: Tue, 9 Jul 2019 15:34:13 +0200
+Subject: [PATCH] Do not "Bind" docker "To" containerd.
+
+relates to https://github.com/docker/for-linux/issues/678
+
+When using the BindTo directive, Docker is permanently stopped by systemd
+when containerd is temporarily killed and restarted;
+
+Using `Requires` achieves mostly the same, but defines a weaker dependency;
+
+https://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requires=
+
+> Requires=
+>
+> .. If this unit gets activated, the units listed will be activated as well.
+> If one of the other units fails to activate, and an ordering dependency
+> After= on the failing unit is set, this unit will not be started. Besides,
+> with or without specifying After=, this unit will be stopped if one of the
+> other units is explicitly stopped.
+
+We may want to look into using `Wants=` instead of `Requires=`, because
+that allows docker to continue running if containerd is restarted, quoting
+the systemd documentation:
+
+> Often, it is a better choice to use Wants= instead of Requires= in order
+> to achieve a system that is more robust when dealing with failing services.
+
+Given that docker will likely still fail if the containerd socket is not
+present, startup will fail if containerd is not running, but if containerd
+is restarted, the docker daemon may be able to try reconnecting.
+
+Signed-off-by: Sebastiaan van Stijn <[e-mail]>
+---
+ systemd/docker.service | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+Origin: upstream, https://github.com/docker/docker-ce-packaging/pull/508
+Bug: https://github.com/docker/for-linux/issues/678
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/containerd/+bug/1870514
+Reviewed-By: Bryce Harrington <[e-mail]>
+Description: This is a backport of upstream's patch, with the path to
+ the docker.service modified and using Wants= rather than Requires=, for
+ reasons outlined above (Requires= did not work).  The After= target
+ also differs from upstream (we don't carry commit 36bb01538.)
+Last-Updated: 2020-12-02
+
+diff --git a/systemd/docker.service b/systemd/docker.service
+index 9c1d9e6d37..0a6a3064a4 100644
+--- a/components/packaging/systemd/docker.service
++++ b/components/packaging/systemd/docker.service
+@@ -1,10 +1,10 @@
+ [Unit]
+ Description=Docker Application Container Engine
+ Documentation=https://docs.docker.com
+-BindsTo=containerd.service
+ After=network-online.target firewalld.service containerd.service
+ Wants=network-online.target
+ Requires=docker.socket
++Wants=containerd.service
+ 
+ [Service]
+ Type=notify
diff --git a/debian/patches/series b/debian/patches/series
index 48cc425..faa7d40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 CVE-2020-15157.patch
+do-not-bind-docker-to-containerd.patch
diff --git a/debian/rules b/debian/rules
index c260943..21043bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,5 +115,13 @@ override_dh_shlibdeps:
 override_dh_auto_clean:
 	@# stop debhelper from doing "make clean"
 
+override_dh_systemd_start:
+	# We take care of determining whether the docker.io service should be
+	# restarted during upgrades or not ourselves, based on the debconf
+	# choice made by the user during installation.  For this reason, we
+	# invoke dh_systemd_start with "-r" in order to avoid indiscriminately
+	# stopping the service during upgrades.
+	dh_systemd_start --package=docker.io -r
+
 %:
 	dh $@ --with=bash-completion,systemd