Support i686 unofficially. Added sample sysctl.conf

1 files changed, 30 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 199e16bfbfc8..fd513688b101 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,6 +2,7 @@
 # Maintainer: Ido Rosen <ido@kernel.org>
 # Contributor: Sébastien "Seblu" Luttringer
 # Contributor: Marcel Wysocki <maci@satgnu.net>
+# Contributor: Daniel YC Lin <dlin.tw@gmail>
 #
 # NOTE: To request changes to this package, please submit a pull request
 #       to the GitHub repository at https://github.com/ido/packages-archlinux
@@ -9,29 +10,34 @@
 #
 
 pkgname=docker-git
-pkgver=0.7.0.dev.4905.a8e99d9
+pkgver=1.0.1.dev.9202.4a9dc8d
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
-arch=('x86_64')
+arch=(i686 'x86_64')
 url="https://github.com/dotcloud/docker"
 license=('Apache')
-depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd' 'btrfs-progs')
-makedepends=('git' 'go' 'device-mapper')
+depends=('bridge-utils' 'iproute2' 'device-mapper' 'sqlite' 'systemd')
+makedepends=('git' 'go' 'btrfs-progs')
+backup=(etc/sysctl.d/docker.conf)
 provides=('docker')
-conflicts=('docker' 'lxc-docker')
-replaces=('lxc-docker-git')
+conflicts=('docker')
 # don't strip binaries! A sha1 is used to check binary consistency.
 options=('!strip')
 source=("git+https://github.com/dotcloud/docker.git"
         'docker.service'
-        'docker.install')
+        'docker.install'
+        docker-nocheck.patch
+        docker.conf
+        )
 md5sums=('SKIP'
          '3f7ccab915fb1942f06e18946c2811d2'
-         '1a8e60447794b3c4f87a2272cc9f144f')
+         '1a8e60447794b3c4f87a2272cc9f144f'
+         '1f8bc27c86d30e2d849102de4b7af1c9'
+         '9bce988683771fb8262197f2d8196202')
 install='docker.install'
 # magic harcoded path
-_magic=src/github.com/dotcloud
+#_magic=src/github.com/dotcloud
 
 pkgver() {
   cd "${srcdir}/docker"
@@ -40,24 +46,30 @@ pkgver() {
 }
 
 prepare() {
-  mkdir -p "$_magic"
-  ln -sfn "../../../docker" "$_magic/docker"
+  #mkdir -p "$_magic"
+  #ln -sfn "../../../docker" "$_magic/docker"
+  #cd "$_magic/docker"
+  cd docker
+  [ $arch = i686 ] && patch -p0 -i $srcdir/docker-nocheck.patch
 }
 
 build() {
-  cd "$_magic/docker"
-  export GOPATH="$srcdir:$srcdir/$_magic/docker/vendor"
+  #cd "$_magic/docker"
+  #export GOPATH="$srcdir:$srcdir/$_magic/docker/vendor"
+  cd docker
+  export AUTO_GOPATH=1
   ./hack/make.sh dynbinary
 }
 
-check() {
-  cd "$_magic/docker"
+#check() {
+  #cd "$_magic/docker"
   # Will be added upstream soon
   #./hack/make.sh dyntest
-}
+#}
 
 package() {
-  cd "$_magic/docker"
+  #cd "$_magic/docker"
+  cd docker
   _dockerver="$(cat VERSION)"
   install -Dm755 "bundles/$_dockerver/dynbinary/docker-$_dockerver" "$pkgdir/usr/bin/docker"
   install -Dm755 "bundles/$_dockerver/dynbinary/dockerinit-$_dockerver" "$pkgdir/usr/lib/docker/dockerinit"
@@ -66,6 +78,7 @@ package() {
   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"
 }
 
 # vim:set ts=2 sw=2 et: