p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

~ -> - for dev versions

Browse Source 
tilde doesn't play nice with docker images so to be uniform let's
replace the tilde with a dash

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ad988a9a4020eaf44245659a8fe7053a2e9b874b
Component: packaging
This commit is contained in:
Eli Uriegas
2018-07-11 00:27:21 +00:00
parent 126b4ecc06
commit f481ae9371
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/packaging/deb/gen-deb-ver
View File

@ -56,7 +56,7 @@ if [[ "$VERSION" == *-dev ]]; then
gitUnix="$($GIT_COMMAND log -1 --pretty='%at')"
gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
debVersion="0.${gitDate}~${gitCommit}"
debVersion="0.${gitDate}-${gitCommit}"
origVersion=$debVersion
# $ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false

4
components/packaging/rpm/gen-rpm-ver
View File

@ -49,9 +49,9 @@ if [[ "$rpmVersion" == *-dev ]] || [ -n "$($GIT_COMMAND status --porcelain)" ];
gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
# gitVersion is now something like '20150128.112847.17e840a'
rpmVersion="0.${gitDate}~${gitCommit}"
rpmVersion="0.${gitDate}-${gitCommit}"
rpmRelease="0"
origVersion="0.${gitDate}~${gitCommit}"
origVersion="0.${gitDate}-${gitCommit}"
fi
# Replace any other dashes with periods

2
components/packaging/static/gen-static-ver
View File

@ -19,7 +19,7 @@ if [[ "$VERSION" == *-dev ]]; then
gitUnix="$($GIT_COMMAND log -1 --pretty='%at')"
gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
staticVersion="0.${gitDate}~${gitCommit}"
staticVersion="0.${gitDate}-${gitCommit}"
fi
echo "$staticVersion"