[master] deb: scan: include packaging revision and distro version in version#823
Closed
thaJeztah wants to merge 1 commit into
Closed
[master] deb: scan: include packaging revision and distro version in version#823thaJeztah wants to merge 1 commit into
thaJeztah wants to merge 1 commit into
Conversation
thaJeztah
force-pushed
the
scan_include_distro
branch
from
25bb35a to
adb7804
Compare
3 tasks
tianon
reviewed
Jan 11, 2023
| # TODO change once we support scan-plugin on other architectures (see dpkg-architecture -L) | ||
| if [ "$(TARGET_ARCH)" = "amd64" ]; then \ | ||
| dh_gencontrol -pdocker-scan-plugin -- -v$${SCAN_DEB_VERSION#v}~$${DISTRO}-$${SUITE}; \ | ||
| dh_gencontrol -pdocker-scan-plugin -- -v$${SCAN_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE}; \ |
Contributor
There was a problem hiding this comment.
Suggested change
| dh_gencontrol -pdocker-scan-plugin -- -v$${SCAN_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE}; \ | |
| dh_gencontrol -pdocker-scan-plugin -- -v$${SCAN_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}~$${SUITE}; \ |
(Still a touch too many hyphen 😂)
Member
Author
There was a problem hiding this comment.
😭 😭 😭 😭 should be fixed now!
This was referenced Jan 11, 2023
Aligning the plugin's version with the format used for docker-ce and docker-ce-cli, as updated in 39772a7 Before this patch: deb/debbuild/ └── ubuntu-jammy ├── docker-buildx-plugin_0.10.0-1~ubuntu.22.04-jammy_arm64.deb ├── docker-ce-cli_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce-rootless-extras_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-compose-plugin_2.15.1-1~ubuntu.22.04-jammy_arm64.deb └── docker-scan-plugin_0.23.0~ubuntu-jammy_arm64.deb With this patch: deb/debbuild/ └── ubuntu-jammy ├── docker-buildx-plugin_0.10.0-1~ubuntu.22.04-jammy_arm64.deb ├── docker-ce-cli_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce-rootless-extras_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-ce_23.0.0~rc.2-1~ubuntu.22.04~jammy_arm64.deb ├── docker-compose-plugin_2.15.1-1~ubuntu.22.04-jammy_arm64.deb └── docker-scan-plugin_0.23.0-1~ubuntu.22.04~jammy_arm64.deb Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
scan_include_distro
branch
from
adb7804 to
1f2ff93
Compare
tianon
approved these changes
Jan 11, 2023
Member
Author
|
I created a 23.0 branch in this repository, so |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Aligning the plugin's version with the format used for docker-ce and
docker-ce-cli, as updated in 39772a7
Before this patch:
With this patch: