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.

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

[18.09] Remove need for SUFFIX in gen-deb-ver #206

Merged
merged 1 commit into from
Sep 12, 2018

Conversation

seemethere
Copy link
Contributor

Cherry pick of #200

Should generate correct bits whether or not the suffix is present.

Working example:

❯ ./gen-deb-ver . 18.09.0-beta1
18.09.0~1.1.beta1 18.09.0-beta1

❯ ./gen-deb-ver . 18.09.0-ce-beta1
18.09.0ce1.1.beta1 18.09.0-ce-beta1

Signed-off-by: Eli Uriegas eli.uriegas@docker.com
(cherry picked from commit 9de3f6f)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com

Should generate correct bits whether or not the suffix is present.

Working example:

❯ ./gen-deb-ver . 18.09.0-beta1
18.09.0~1.1.beta1 18.09.0-beta1

❯ ./gen-deb-ver . 18.09.0-ce-beta1
18.09.0~ce~1.1.beta1 18.09.0-ce-beta1

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 9de3f6f)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
@seemethere seemethere added the backport Backports to release branches label Sep 12, 2018
@seemethere seemethere requested a review from a team September 12, 2018 13:09
@seemethere
Copy link
Contributor Author

Will merge on green since this is a backport

Copy link
Contributor

@jose-bigio jose-bigio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@seemethere seemethere merged commit 798d4cc into docker:18.09 Sep 12, 2018
jgitlin-bt added a commit to jgitlin-bt/integration that referenced this pull request Nov 12, 2018
…-packaging#206) so we should just check to see if we're on version >2.x.x
jgitlin-bt added a commit to jgitlin-bt/integration that referenced this pull request Nov 13, 2018
…-packaging#206) so we should just check to see if we're on version >2.x.x

Changelog: Fix docker version detection

Signed-off-by: Josh Gitlin <jgitlin@goboomtown.com>
kacf pushed a commit to mendersoftware/integration that referenced this pull request Nov 14, 2018
…-packaging#206) so we should just check to see if we're on version >2.x.x

Changelog: Fix docker version detection

Signed-off-by: Josh Gitlin <jgitlin@goboomtown.com>
(cherry picked from commit a24f3a2)
kacf pushed a commit to mendersoftware/integration that referenced this pull request Nov 14, 2018
…-packaging#206) so we should just check to see if we're on version >2.x.x

Changelog: Fix docker version detection

Signed-off-by: Josh Gitlin <jgitlin@goboomtown.com>
(cherry picked from commit a24f3a2)
kacf pushed a commit to mendersoftware/integration that referenced this pull request Nov 14, 2018
…-packaging#206) so we should just check to see if we're on version >2.x.x

Changelog: Fix docker version detection

Signed-off-by: Josh Gitlin <jgitlin@goboomtown.com>
(cherry picked from commit a24f3a2)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Backports to release branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants