diff options
author | Chris Fordham | 2017-11-14 21:03:50 +1100 |
---|---|---|
committer | Chris Fordham | 2017-11-14 21:03:50 +1100 |
commit | 6b87b9bb5308345ec41f3487fdb2d07ad27fdafd (patch) | |
tree | 3e37feac796bbf9bef85b63e55cba4a34816b862 | |
parent | 2bee959ff197419b623ea6bb35c8c110825a3a47 (diff) | |
download | aur-6b87b9bb5308345ec41f3487fdb2d07ad27fdafd.tar.gz |
Fix use of version for the package as moby/VERSION no longer used upstream.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | PKGBUILD | 9 |
3 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,6 @@ pkgbase = docker-git pkgdesc = Pack, ship and run any application as a lightweight container. - pkgver = 17.06.0.dev.33726.f2afa26235 + pkgver = r33899.aea31ab242 pkgrel = 1 epoch = 1 url = https://github.com/docker/docker diff --git a/.gitignore b/.gitignore index 8fcb86707e6b..f699113ed486 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ /containerd/ /libnetwork/ /moby/ +/docker-ce/ +/tini/ /pkg/ /src/ *.pkg.tar.xz @@ -13,7 +13,7 @@ pkgname=docker-git _pkgname=docker -pkgver=17.06.0.dev.33726.f2afa26235 +pkgver=r33899.aea31ab242 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container.' @@ -46,8 +46,8 @@ md5sums=('SKIP' pkgver() { pushd "$srcdir/moby" > /dev/null - _dockerver="$(cat VERSION)" - printf "%s.%s.%s" "${_dockerver//-/.}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ( set -o pipefail; + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" ) popd > /dev/null } @@ -170,9 +170,8 @@ package() { install -Dm755 "$GOPATH/src/github.com/docker/libnetwork/bin/docker-proxy" "$pkgdir/usr/bin/docker-proxy" msg2 'dockerd binary' - _dockerver="$(cat $srcdir/moby/VERSION)" pushd "$srcdir/moby/bundles/dynbinary-daemon" >/dev/null - install -Dm755 "dockerd-$_dockerver" "$pkgdir/usr/bin/dockerd" + install -Dm755 "dockerd-dev" "$pkgdir/usr/bin/dockerd" popd >/dev/null msg2 'docker cli binary' |