aboutsummaryrefslogtreecommitdiffstats
path: root/main/docker
diff options
context:
space:
mode:
authorBartłomiej Piotrowski <bpiotrowski@alpinelinux.org>2015-01-26 15:16:17 +0100
committerBartłomiej Piotrowski <bpiotrowski@alpinelinux.org>2015-01-26 15:16:17 +0100
commitb9178b31324711f7c87e0c98be7695b9a049baf0 (patch)
tree12878a0e3f977c375370cc3ae131dfe8ffb45973 /main/docker
parent166b070e7feced6cba60f62e9957716f94884e3f (diff)
downloadaports-b9178b31324711f7c87e0c98be7695b9a049baf0.tar.bz2
aports-b9178b31324711f7c87e0c98be7695b9a049baf0.tar.xz
main/docker: upgrade to 1.4.1
Diffstat (limited to 'main/docker')
-rw-r--r--main/docker/APKBUILD29
1 files changed, 7 insertions, 22 deletions
diff --git a/main/docker/APKBUILD b/main/docker/APKBUILD
index 3304551232..3c5b75e076 100644
--- a/main/docker/APKBUILD
+++ b/main/docker/APKBUILD
@@ -1,36 +1,26 @@
# Maintainer: Eivind Uggedal <eivind@uggedal.com>
pkgname=docker
-pkgver=1.2.0
+pkgver=1.4.1
pkgrel=0
-_gitcommit=fa7b24f
+_gitcommit=5bc2ff8
pkgdesc="Pack, ship and run any application as a lightweight container"
url="http://www.docker.io/"
arch="x86_64"
license="ASL 2.0"
depends="iptables git xz"
depends_dev=""
-makedepends="go sqlite-dev btrfs-progs-dev bash"
+makedepends="go sqlite-dev btrfs-progs-dev bash linux-headers"
options="!strip"
install="$pkgname.pre-install"
subpackages="
$pkgname-bash-completion:completion
- $pkgname-doc
$pkgname-vim:vim
"
source="
$pkgname-$pkgver.tar.gz::https://github.com/docker/docker/archive/v$pkgver.tar.gz
- http://dev.alpinelinux.org/archive/$pkgname/$pkgname-man-$pkgver.tar.gz
docker.init-ulimit-fix.patch
"
-# Generation of man page source archive:
-# - cd docs/man
-# - docker build -t fedora/pandoc .
-# - docker run -v $(pwd):/pandoc:rw -w /pandoc -i fedora/pandoc /pandoc/md2man-all.sh
-# - mkdir docker-man-$pkgver
-# - cp -r man[0-9] docker-man-$pkgver
-# - tar czf docker-man-$pkgver.tar.gz docker-man-$pkgver
-
_builddir="$srcdir"/$pkgname-$pkgver
_buildtags="exclude_graphdriver_aufs exclude_graphdriver_devicemapper"
@@ -50,6 +40,7 @@ build() {
export AUTO_GOPATH=1
export DOCKER_GITCOMMIT=$_gitcommit
export DOCKER_BUILDTAGS=$_buildtags
+ unset CC # prevent possible ccache issues
./hack/make.sh dynbinary
}
@@ -70,9 +61,6 @@ package() {
"$pkgdir"/etc/init.d/docker
install -Dm644 contrib/init/openrc/docker.confd \
"$pkgdir"/etc/conf.d/docker
-
- install -dm755 "$pkgdir"/usr/share/man
- cp -a "$srcdir"/$pkgname-man-$pkgver/man1 "$pkgdir"/usr/share/man
}
completion() {
@@ -97,12 +85,9 @@ vim() {
done
}
-md5sums="cea0b533c0fae5d2aaef6b3abd92af5d docker-1.2.0.tar.gz
-95f4b172bea6879e09c966c979cf70d9 docker-man-1.2.0.tar.gz
+md5sums="70068f2f59e8d4241ca344dcacdd2058 docker-1.4.1.tar.gz
265bb875f508b7aeaa369cd1692b2caa docker.init-ulimit-fix.patch"
-sha256sums="d7ab9ab0984044efdeba6b292e2e8b07f1f14fef51a444f8a3749d30d32567da docker-1.2.0.tar.gz
-c4be472c289e124dfc769a50b679707ebc7698ebf44c174afab591146d08a4d3 docker-man-1.2.0.tar.gz
+sha256sums="34300e214e5d2f1633d9650be16bce86d635d72596faa575912fecefda612835 docker-1.4.1.tar.gz
e7c4d5be9ea9090abb531feed91d5d47464283bec66474e263075db211556c72 docker.init-ulimit-fix.patch"
-sha512sums="0856c055c4135b578a2bd8811482ada76e94c9cd3f23626dc30858d59cbc52fcdf1f9965a9e519b29daf85a18b236f0d5964e0c0f774966d9574a9b9b4cff288 docker-1.2.0.tar.gz
-7ecf4d5381606bb95d55b1a2e7d005e43a168b3f420e3ec2a9ba3a2bd0efa5c5ca5c7cc577b1722ab4293460a282ca1c0cfdd6184393a200deabc7e333ab0df1 docker-man-1.2.0.tar.gz
+sha512sums="e83bbc5443c42836768e71ba4a7f1aea0ba062439c85fef12bff3e812eb3c93b47bd455f36abbcf5a332c293f3274f7a00b3909ec4b919eff449aa52557997b3 docker-1.4.1.tar.gz
d677d0540d3106b42d7745f61ece8e017301771d808ce81c28378543e13dbf5655092d9c1745e84227159882cd9af8c7211a146c716cb5ed10e6b15438611973 docker.init-ulimit-fix.patch"