Skip to content

deb, rpm: slight refactor and cleanup#229

Merged
crazy-max merged 3 commits intodocker:mainfrom
crazy-max:deb-rpm-cleanups
Jun 27, 2025
Merged

deb, rpm: slight refactor and cleanup#229
crazy-max merged 3 commits intodocker:mainfrom
crazy-max:deb-rpm-cleanups

Conversation

@crazy-max
Copy link
Copy Markdown
Member

@thaJeztah
Copy link
Copy Markdown
Member

Wondering if we want to preserve some of the history / context from the individual commits in the other PR; have you tried if patches from that PR would apply (if the path is rewritten)? docker/docker-ce-packaging#1154

@crazy-max
Copy link
Copy Markdown
Member Author

have you tried if patches from that PR would apply (if the path is rewritten)? docker/docker-ce-packaging#1154

Might be possible, I can try

crazy-max and others added 3 commits June 27, 2025 12:04
The "make dynbinary" target calls ./scripts/build/binary with the
right options set, and does not use docker to build (so can be
run as part of our deb/rpm build scripts.

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
… -p"

The "-D" option creates parent directories if missing; we
can use it in most places, except for one where we're using
wildcards, as installing multiple files requires the target
directory to exist.

"install -p" unlikely makes a big difference, as some files
may have timestampsbased on checkout date or being generated,
but it doesn't hurt doing either.

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
The dh_bash-completion debhelper provides an easy way to install the
shell-completion scripts for Bash. Unfortunately there is no stable
equivalent yet for the other shells (zsh, fish, powershell), which
resulted in two out of three shells requiring manual install.

Given that the installation path for Bash is [well-documented][1],
we can align Bash with the other shells to make this less confusing.

This patch makes that change, and adds a code-comment to outline
the reasoning (and possible future options) for future readers.

[1]: https://github.com/scop/bash-completion/blob/79fd051907328c8c26372691f68d627c1f0e3916/README.md

Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
@crazy-max
Copy link
Copy Markdown
Member Author

Was not able to align history so kept comments instead if that's fine with you

@crazy-max crazy-max merged commit 1cea804 into docker:main Jun 27, 2025
292 checks passed
@crazy-max crazy-max deleted the deb-rpm-cleanups branch June 27, 2025 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants