Skip to content
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

[master] deb, rpm: slight refactor / cleanup #1154

Merged
merged 6 commits into from
Jan 24, 2025
+56 −31
Merged

[master] deb, rpm: slight refactor / cleanup #1154

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cbbf7a
deb, rpm: use "make dynbinary" instead of ./scripts/build/binary
thaJeztah Jan 23, 2025
6d05ae6
rpm: use install -D where possible
thaJeztah Jan 23, 2025
503bad1
rpm: consistently use "install -p" (--preserve-timestamps)
thaJeztah Jan 23, 2025
5b91b48
deb: consistently use "install -p" (--preserve-timestamps)
thaJeztah Jan 23, 2025
59ca4ac
deb: put installing completions in a separate block
thaJeztah Jan 24, 2025
f9f36d4
deb: stop using dh_bash-completion for bash completions
thaJeztah Jan 23, 2025
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
Prev Previous commit
Next Next commit
deb: put installing completions in a separate block 
Makes it slightly clearer where installing the CLI itself
ends, and where installing completion scripts start.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
thaJeztah committed Jan 24, 2025
commit 59ca4ac5ff268ed7bf7ea5e5aeb70444ecbe8fc3
4 changes: 3 additions & 1 deletion deb/common/rules
View file
Original file line number Diff line number Diff line change
@@ -69,9 +69,11 @@ override_dh_dwz:

override_dh_auto_install:
# docker-ce-cli install
install -D -p -m 0755 cli/build/docker debian/docker-ce-cli/usr/bin/docker

# docker-ce-cli shell-completion
install -D -p -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
install -D -p -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
install -D -p -m 0755 cli/build/docker debian/docker-ce-cli/usr/bin/docker

# docker-ce install
install -D -p -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd