Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master

This commit is contained in:
GordonTheTurtle
2018-03-21 17:05:32 +00:00
2 changed files with 4 additions and 1 deletions

View File

@ -46,4 +46,4 @@ echo VERSION BBB $VERSION
dpkg-buildpackage -uc -us -I.git
destination="/build"
mkdir -p "$destination"
mv -v /root/docker-ce* "$destination"
mv -v /root/docker* "$destination"

View File

@ -27,6 +27,9 @@ gen_deb_version() {
}
case "$VERSION" in
*-dev)
debVersion="$VERSION"
;;
*-tp[0-9]*)
debVersion="$(gen_deb_version "$VERSION" tp 0)"
;;