[arch-commits] Commit in docker/trunk (02-fix-unified-cgroup.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Thursday, October 22, 2015 @ 21:51:17
  Author: seblu
Revision: 144737

upgpkg: docker 1:1.8.3-2

- fix FS#46779
- fix FS#46602

Added:
  docker/trunk/02-fix-unified-cgroup.patch
Modified:
  docker/trunk/PKGBUILD

-----------------------------+
 02-fix-unified-cgroup.patch |   13 +++++++++++++
 PKGBUILD                    |    9 ++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

Added: 02-fix-unified-cgroup.patch
===================================================================
--- 02-fix-unified-cgroup.patch	                        (rev 0)
+++ 02-fix-unified-cgroup.patch	2015-10-22 19:51:17 UTC (rev 144737)
@@ -0,0 +1,13 @@
+diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
+index f09c2d3..ab5bc8f 100644
+--- a/contrib/init/systemd/docker.service
++++ b/contrib/init/systemd/docker.service
+@@ -6,7 +6,7 @@ Requires=docker.socket
+ 
+ [Service]
+ Type=notify
+-ExecStart=/usr/bin/docker daemon -H fd://
++ExecStart=/usr/bin/docker daemon -H fd:// --exec-opt native.cgroupdriver=cgroupfs
+ MountFlags=slave
+ LimitNOFILE=1048576
+ LimitNPROC=1048576

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-22 19:45:09 UTC (rev 144736)
+++ PKGBUILD	2015-10-22 19:51:17 UTC (rev 144737)
@@ -3,7 +3,7 @@
 
 pkgname=docker
 pkgver=1.8.3
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
 arch=('x86_64')
@@ -18,13 +18,16 @@
 install=$pkgname.install
 source=("git+https://github.com/docker/docker.git#tag=v$pkgver"
         "$pkgname.sysusers"
-        '01-golang15.patch')
+        '01-golang15.patch'
+        '02-fix-unified-cgroup.patch')
 md5sums=('SKIP'
          '8cf9900ebada61f352a03465a088da34'
-         '0511f2bbc52219a960dc91ea9c2d9e44')
+         '0511f2bbc52219a960dc91ea9c2d9e44'
+         '7fd0504057a60e1275b8ce3e06d53c53')
 
 prepare() {
   patch -p1 -d docker < 01-golang15.patch
+  patch -p1 -d docker < 02-fix-unified-cgroup.patch
 }
 
 build() {