- remove extra line return in .gitignore

- remove docker.conf (opinionated default)
- remove docker.service (now uses upstream contrib)
- add docker.sysusers from archlinux official pkg
- user git versions of runc and containerd
- split into docker/dockerd (patch from Franck Séhédic)
- add nice symlinks from archlinux official pkg
- bump .SRCINFO from changes

6 files changed, 21 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 57984f70d030..76aae4670d89 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Jan 31 00:19:40 UTC 2016
+# Fri Jun 10 02:00:22 UTC 2016
 pkgbase = docker-git
 	pkgdesc = Pack, ship and run any application as a lightweight container.
-	pkgver = 1.10.0.dev.21841.5f5a752
+	pkgver = 1.12.0.dev.24773.5bdc833
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/docker/docker
@@ -14,6 +14,8 @@ pkgbase = docker-git
 	makedepends = go
 	makedepends = btrfs-progs
 	makedepends = go-md2man
+	depends = runc-git
+	depends = containerd-git
 	depends = bridge-utils
 	depends = iproute2
 	depends = device-mapper
@@ -22,15 +24,9 @@ pkgbase = docker-git
 	provides = docker
 	conflicts = docker
 	options = !strip
-	backup = etc/sysctl.d/docker.conf
 	source = git+https://github.com/docker/docker.git
-	source = docker.service
 	source = docker.install
-	source = docker.conf
 	md5sums = SKIP
-	md5sums = f95610c9cb86cb617371040dad5b95d3
 	md5sums = 1a8e60447794b3c4f87a2272cc9f144f
-	md5sums = 9bce988683771fb8262197f2d8196202
 
 pkgname = docker-git
-
diff --git a/.gitignore b/.gitignore
index ef41f698fb6b..3d77a5bd0749 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 /pkg/
 /src/
 *.pkg.tar.xz
-
diff --git a/PKGBUILD b/PKGBUILD
index 53d64dd50b95..cd02b2ef018c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: bfc54885f6617a81b35939f12f0a9f02199bb6d8 $
 # Maintainer: Ido Rosen <ido@kernel.org>
-# Co-maintainer: Chris Fordham <chris at fordham-nagy dot id dot au> aka flaccid
+# Co-maintainer: Chris Fordham <chris [at] fordham-nagy [dot] [id] [dot] [au]> aka flaccid
 # Contributor: Sébastien "Seblu" Luttringer
 # Contributor: Marcel Wysocki <maci@satgnu.net>
 # Contributor: Daniel YC Lin <dlin.tw@gmail>
@@ -16,29 +16,26 @@
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md
 
 pkgname=docker-git
-pkgver=1.10.0.dev.21841.5f5a752
+_pkgname=docker
+pkgver=1.12.0.dev.24773.5bdc833
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container.'
 arch=('i686' 'x86_64')
 url="https://github.com/docker/docker"
 license=('Apache License Version 2.0')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
+depends=('runc-git' 'containerd-git' 'bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
 makedepends=('git' 'go' 'btrfs-progs' 'go-md2man')
-backup=(etc/sysctl.d/docker.conf)
 provides=('docker')
 conflicts=('docker')
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
 source=("git+https://github.com/docker/docker.git"
-        'docker.service'
         'docker.install'
-        docker.conf
         )
 md5sums=('SKIP'
-         'f95610c9cb86cb617371040dad5b95d3'
          '1a8e60447794b3c4f87a2272cc9f144f'
-         '9bce988683771fb8262197f2d8196202')
+        )
 install='docker.install'
 # magic harcoded path
 #_magic=src/github.com/dotcloud
@@ -77,15 +74,23 @@ package() {
   #cd "$_magic/docker"
   cd docker
   _dockerver="$(cat VERSION)"
-  install -Dm755 "bundles/$_dockerver/dynbinary/docker-$_dockerver" "$pkgdir/usr/bin/docker"
+  install -Dm755 "bundles/$_dockerver/dynbinary-client/docker-$_dockerver" "$pkgdir/usr/bin/docker"
+  install -Dm755 "bundles/$_dockerver/dynbinary-daemon/dockerd-$_dockerver" "$pkgdir/usr/bin/dockerd"
+
+  # 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"
 
   # systemd
-  install -Dm644 "$srcdir/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service"
-  install -Dm644 "$srcdir/docker.conf" "$pkgdir/etc/sysctl.d/docker.conf"
+  install -Dm644 'contrib/init/systemd/docker.service' "$pkgdir/usr/lib/systemd/system/docker.service"
+  install -Dm644 'contrib/init/systemd/docker.socket' "$pkgdir/usr/lib/systemd/system/docker.socket"
+  install -Dm644 "$startdir/docker.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
   cd man
   for section in 1 5; do
diff --git a/docker.conf b/docker.conf
deleted file mode 100644
index 8e6edb580118..000000000000
--- a/docker.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-## disable ALL packet forwarding (not a router, disable it) (default)
-#net.ipv4.ip_forward = 0
diff --git a/docker.service b/docker.service
deleted file mode 100644
index 80d772d6d17e..000000000000
--- a/docker.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target
-
-[Service]
-ExecStartPre=/usr/bin/mount --make-rprivate /
-ExecStart=/usr/bin/docker daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/docker.sysusers b/docker.sysusers
new file mode 100644
index 000000000000..0f62654dc78f
--- /dev/null
+++ b/docker.sysusers
@@ -0,0 +1 @@
+g docker - -