[master] deb: buildx, compose: include packaging revision and distro version in version #822
Conversation
This file contains 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
This variable can be used as packaging-revision in package versions Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Aligning the plugin's version with the format used for docker-ce and docker-ce-cli, as updated in 39772a7 Before this patch: tree deb/debbuild/ deb/debbuild/ └── ubuntu-jammy ├── docker-buildx-plugin_0.10.0~ubuntu-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~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~ubuntu-jammy_arm64.deb Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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~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 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2 tasks
thaJeztah
changed the title
crazy-max
approved these changes
Jan 11, 2023
|
Thx! I'll cherry-pick the compose changes to the 20.10 branch, so that we don't have a clash in package names if we release from that |
This needs to change too, right? (https://github.com/docker/docker-ce-packaging/pull/825/files#r1067525089) |
Yup! See |
tianon
reviewed
Jan 11, 2023
| @@ -111,11 +114,11 @@ override_dh_install: | |||
| override_dh_gencontrol: | |||
| # Use separate version for the buildx-plugin package, then generate the other control files as usual | |||
| # TODO override "Source" field in control as well (to point to buildx, as it doesn't match the package name) | |||
| dh_gencontrol -pdocker-buildx-plugin -- -v$${BUILDX_DEB_VERSION#v}~$${DISTRO}-$${SUITE} | |||
| dh_gencontrol -pdocker-buildx-plugin -- -v$${BUILDX_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE} | |||
There was a problem hiding this comment.
👀
Suggested change
| dh_gencontrol -pdocker-buildx-plugin -- -v$${BUILDX_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE} | |
| dh_gencontrol -pdocker-buildx-plugin -- -v$${BUILDX_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}~$${SUITE} |
tianon
reviewed
Jan 11, 2023
|
|
||
| # Use separate version for the compose-plugin package, then generate the other control files as usual | ||
| # TODO override "Source" field in control as well (to point to compose, as it doesn't match the package name) | ||
| dh_gencontrol -pdocker-compose-plugin -- -v$${COMPOSE_DEB_VERSION#v}~$${DISTRO}-$${SUITE} | ||
| dh_gencontrol -pdocker-compose-plugin -- -v$${COMPOSE_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE} |
There was a problem hiding this comment.
👀
Suggested change
| dh_gencontrol -pdocker-compose-plugin -- -v$${COMPOSE_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE} | |
| dh_gencontrol -pdocker-compose-plugin -- -v$${COMPOSE_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}~$${SUITE} |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
deb: introduce PKG_REVISION variable
This variable can be used as packaging-revision in package versions
deb: buildx: include packaging revision and distro version in version
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:
deb: compose: include packaging revision and distro version in version
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: