Skip to content

[master] Update "deb" packaging to use "dh_installsystemd", and remove upstart script #914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neersighted merged 1 commit into from
Jul 21, 2023
Merged

[master] Update "deb" packaging to use "dh_installsystemd", and remove upstart script #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
matrix:
target:
- debian-bullseye
- debian-bookworm
- ubuntu-focal
- ubuntu-jammy
steps:
-
name: Checkout
Expand Down
1 change: 0 additions & 1 deletion deb/common/compat
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion deb/common/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Build-Depends: bash,
ca-certificates,
cmake,
dh-apparmor,
debhelper (>= 10~) | dh-systemd,
debhelper-compat (= 12),
gcc,
git,
libc-dev,
Expand Down
1 change: 1 addition & 0 deletions deb/common/docker-ce.docker.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../engine/contrib/init/systemd/docker.service
1 change: 1 addition & 0 deletions deb/common/docker-ce.docker.socket
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../engine/contrib/init/systemd/docker.socket
72 changes: 0 additions & 72 deletions deb/common/docker-ce.docker.upstart
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions deb/common/docker-ce.maintscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rm_conffile /etc/init/docker.conf 5:24.0.5-1~
12 changes: 10 additions & 2 deletions deb/common/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,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/libexec/docker/docker-init
Expand All @@ -81,6 +85,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

Expand Down