[arch-commits] Commit in docker/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Wednesday, April 27, 2016 @ 03:18:27
  Author: seblu
Revision: 171947

upgpkg: docker 1:1.11.0-1

Modified:
  docker/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-27 01:17:52 UTC (rev 171946)
+++ PKGBUILD	2016-04-27 01:18:27 UTC (rev 171947)
@@ -2,7 +2,7 @@
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=1.10.3
+pkgver=1.11.0
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -9,7 +9,7 @@
 arch=('x86_64')
 url='https://www.docker.com/'
 license=('Apache')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
+depends=('runc' 'containerd' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
 makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
 optdepends=('btrfs-progs: btrfs backend support'
             'lxc: lxc backend support')
@@ -39,7 +39,7 @@
   export AUTO_GOPATH=1
   hack/make.sh dynbinary
   # man pages
-  man/md2man-all.sh
+  man/md2man-all.sh 2>/dev/null
 }
 
 #check() {
@@ -50,7 +50,11 @@
 package() {
   cd docker
   install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker"
-  install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit"
+  # symlink containerd/run (nice integration...)
+  ln -s containerd "$pkgdir/usr/bin/docker-containerd"
+  ln -s containerd-shim "$pkgdir/usr/bin/docker-containerd-shim"
+  ln -s ctr "$pkgdir/usr/bin/docker-containerd-ctr"
+  ln -s runc "$pkgdir/usr/bin/docker-runc"
   # completion
   install -Dm644 'contrib/completion/bash/docker' "$pkgdir/usr/share/bash-completion/completions/docker"
   install -Dm644 'contrib/completion/zsh/_docker' "$pkgdir/usr/share/zsh/site-functions/_docker"