docker · thaJeztah · May 17, 2022 · May 3, 2022 · thaJeztah · May 9, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,12 @@ jobs:
       fail-fast: false
       matrix:
         target:
+          - debian-buster
           - debian-bullseye
+          - ubuntu-bionic
+          - ubuntu-focal
+          - ubuntu-impish
+          - ubuntu-jammy
     steps:
       -
         name: Checkout

diff --git a/deb/common/compat b/deb/common/compat
diff --git a/deb/common/control b/deb/common/control
@@ -7,7 +7,7 @@ Build-Depends: bash,
                ca-certificates,
                cmake,
                dh-apparmor,
-               debhelper (>= 10~) | dh-systemd,
+               debhelper-compat (= 12),
                gcc,
                git,
                libbtrfs-dev | btrfs-tools,

diff --git a/deb/common/docker-ce.docker.service b/deb/common/docker-ce.docker.service
@@ -0,0 +1 @@
+engine/contrib/init/systemd/docker.service
diff --git a/deb/common/docker-ce.docker.socket b/deb/common/docker-ce.docker.socket
@@ -0,0 +1 @@
+engine/contrib/init/systemd/docker.socket
diff --git a/deb/common/docker-ce.docker.upstart b/deb/common/docker-ce.docker.upstart
diff --git a/deb/common/docker-ce.maintscript b/deb/common/docker-ce.maintscript
@@ -0,0 +1,3 @@
+# *technically* this "5:21~" should be something more specific like "5:22.06.1-1~" (the first released version to introduce this "rm_conffile" line), but as long as it's strictly *newer* than the last version to ship the conffile and stricly *older* than the first version with the rm_conffile line, it should work fine (so we're using the will-never-exist major version of "21" as our in-between release for the 20.xx to 22.xx)
+rm_conffile /etc/init/docker.conf 5:21~
+# this should stick around in the package until there are no more users who will ever upgrade from "5:20.xx" to something newer (it's reasonably harmless for this to stay indefinitely)
diff --git a/deb/common/rules b/deb/common/rules
@@ -62,15 +62,19 @@ override_dh_auto_test:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	# docker-ce-cli install
 	install -D -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
 	install -D -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
 	install -D -m 0755 cli/build/docker debian/docker-ce-cli/usr/bin/docker
 
 	# docker-ce install
-	install -D -m 0644 engine/contrib/init/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service
-	install -D -m 0644 engine/contrib/init/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
 	install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd
 	install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/docker-proxy) debian/docker-ce/usr/bin/docker-proxy
 	install -D -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/bin/docker-init
@@ -98,6 +102,10 @@ override_dh_installinit:
 	# use "docker" as our service name, not "docker-ce"
 	dh_installinit --name=docker
 
+override_dh_installsystemd:
+	# use "docker" as our service name, not "docker-ce"
+	dh_installsystemd --name=docker
+
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 

diff --git a/deb/ubuntu-bionic/Dockerfile b/deb/ubuntu-bionic/Dockerfile
@@ -8,7 +8,8 @@ FROM ${GO_IMAGE} AS golang
 FROM ${BUILD_IMAGE}
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y curl devscripts equivs git
+ARG SUITE
+RUN apt-get update && apt-get install -y curl devscripts equivs git debhelper/${SUITE}-backports dwz/${SUITE}-backports
 
 ENV GOPROXY=direct
 ENV GO111MODULE=off
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		engine/contrib/init/systemd/docker.service
Copy link Copy Markdown Member thaJeztah May 9, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. How does this work? 🤔 Can the file contain the name of "actual file to look for"? Or is this just a "placeholder"? (trying to understand what this does) Copy link Copy Markdown Contributor Author tianon May 9, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Oh sorry, this is a symlink! We could probably replace the other init scripts with symlinks too (if they're unchanged from what's in `moby/moby`). Copy link Copy Markdown Member thaJeztah May 9, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Oh! LOL Didn't expect it to show up as a regular file in github's UI 🤦‍♂️😂 Copy link Copy Markdown Contributor Author tianon May 9, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Yeahhhhh, I really wish symlinks were more obviously labelled in diffs, but at least it shows something! 😄