From 285031f2389db5ce848f1cb7bb7b2e7368c2c465 Mon Sep 17 00:00:00 2001 From: Jason Plum Date: Tue, 10 Feb 2015 21:17:22 -0500 Subject: [PATCH] communtiy/docker to 1.5.0-1 --- community/docker/0001-daemon-no-arch-check.patch | 13 ------------- community/docker/PKGBUILD | 9 +++------ 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 community/docker/0001-daemon-no-arch-check.patch diff --git a/community/docker/0001-daemon-no-arch-check.patch b/community/docker/0001-daemon-no-arch-check.patch deleted file mode 100644 index 4ed1fd1b7..000000000 --- a/community/docker/0001-daemon-no-arch-check.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/daemon/daemon.go 2014-08-28 21:22:18.805001026 -0400 -+++ b/daemon/daemon.go 2014-08-28 21:23:52.030001071 -0400 -@@ -1095,10 +1095,6 @@ func (daemon *Daemon) ImageGetCached(img - } - - func checkKernelAndArch() error { -- // Check for unsupported architectures -- if runtime.GOARCH != "amd64" { -- return fmt.Errorf("The Docker runtime currently only supports amd64 (not %s). This will change in the future. Aborting.", runtime.GOARCH) -- } - // Check for unsupported kernel versions - // FIXME: it would be cleaner to not test for specific versions, but rather - // test for specific functionalities. diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD index 283ef0404..c3b6b1041 100644 --- a/community/docker/PKGBUILD +++ b/community/docker/PKGBUILD @@ -5,7 +5,7 @@ # ALARM: Jason Plum pkgname=docker -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 epoch=1 pkgdesc='Pack, ship and run any application as a lightweight container' @@ -19,14 +19,11 @@ optdepends=('btrfs-progs: btrfs backend support' # don't strip binaries! A sha1 is used to check binary consistency. options=('!strip') install=$pkgname.install -source=("git+https://github.com/docker/docker.git#tag=v$pkgver" - "0001-daemon-no-arch-check.patch") -md5sums=('SKIP' - '6746a788096a02829666c67bece899d5') +source=("git+https://github.com/docker/docker.git#tag=v$pkgver") +md5sums=('SKIP') build() { cd docker - patch -p1 < $srcdir/0001-daemon-no-arch-check.patch export AUTO_GOPATH=1 ./hack/make.sh dynbinary }