aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-09-14 15:03:37 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-09-14 15:03:37 +0000
commit42737101590cb4129c055e495e7b454460305270 (patch)
tree891118f8b0aa2a6135403a78f63908c73541fb2b
parentdf6821feaf2cf3c3da4a496525469ca67301d347 (diff)
downloadaports-42737101590cb4129c055e495e7b454460305270.tar.gz
aports-42737101590cb4129c055e495e7b454460305270.tar.bz2
aports-42737101590cb4129c055e495e7b454460305270.tar.xz
community/docker: make docker service depend on sysfs
ref #6038
-rw-r--r--community/docker/APKBUILD8
-rw-r--r--community/docker/docker-openrc-fixes.patch35
2 files changed, 24 insertions, 19 deletions
diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD
index 5e942a95ce..104021d869 100644
--- a/community/docker/APKBUILD
+++ b/community/docker/APKBUILD
@@ -2,7 +2,7 @@
pkgname=docker
pkgver=1.12.1
_ver=${pkgver/_/-}
-pkgrel=0
+pkgrel=1
_gitcommit=v$_ver
pkgdesc="Pack, ship and run any application as a lightweight container"
url="http://www.docker.io/"
@@ -152,12 +152,12 @@ vim() {
md5sums="7af7b4c25d414aa19bc7382bd85c25f7 docker-1.12.1.tar.gz
716d0b284ce42490eeb83befba10fafb runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz
f0a0c1101ad259b84fb457c8c7036723 containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz
-506e32a6157a7f92e67511111fba6fe8 docker-openrc-fixes.patch"
+41d0008283777d8ea7e8ab6ebe230c07 docker-openrc-fixes.patch"
sha256sums="0c71255fc69ffec377800468e2b1c97681f150f3719ffa09829a17b717ff4e01 docker-1.12.1.tar.gz
196b78c6caf1a4c6257314b393381baffa7c82bb2690ac02a7b3d6cd6cfe7776 runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz
5c1bcd8e3b7bc6034e7523b6eca7de974562b7fdc72c440494234ae10a0e545b containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz
-864d229e21dfa6c931b29b908093302a48837ddb1aa4205088f6f7fd4d7da4e3 docker-openrc-fixes.patch"
+13835e08cc7a7a530f19a037d9e1442f1393a6573bec60fe9d41b434c460200d docker-openrc-fixes.patch"
sha512sums="8917e23d2826f45951710dcc47625c272405466661b7fa6b75fb7e143fdcc5c78cbf6a7475663b96b22126ba3c2dab3b3a8c11ca396dc8408d1aa9f2667c95e7 docker-1.12.1.tar.gz
0bf8ce3bb15caaf09214f23a411003fd5b660d291662ad513c3d944647a0fa9b270d18902706b7e6aa3c30eb0f676e73af46b8249d1e2484e1dc40d6ffd5a80d runc-cc29e3dded8e27ba8f65738f40d251c885030a28.tar.gz
a47200c2f867d6624e51eb1aa83743f1e0b86d96d462b7649c240f335eb72e499a00923e190759e57d4c456d912f9541750e9df21ebc2b713b87bea1ead55e7b containerd-0ac3cd1be170d180b2baed755e8f0da547ceb267.tar.gz
-1162f62e8a7a5ded0c54cfe46014449efd67491bdb678fa22862117adb08206c909a3f98b0062125d25256dc1f48596b696bd4b19a8804d2862e758678a8bb62 docker-openrc-fixes.patch"
+42f35d9e7a82f6f4cc0b6a6ecfc1a970f935c54aa639873a49c5be5dc62a50503a9435ddfe5af74d378e1297b0e1509f5cbe84a7ba98bd0b51deeaa25495415d docker-openrc-fixes.patch"
diff --git a/community/docker/docker-openrc-fixes.patch b/community/docker/docker-openrc-fixes.patch
index f350daaf93..cd6f99cb3a 100644
--- a/community/docker/docker-openrc-fixes.patch
+++ b/community/docker/docker-openrc-fixes.patch
@@ -1,13 +1,28 @@
+diff --git a/contrib/init/openrc/docker.confd b/contrib/init/openrc/docker.confd
+index 2444031..b5f431c 100644
+--- a/contrib/init/openrc/docker.confd
++++ b/contrib/init/openrc/docker.confd
+@@ -11,3 +11,6 @@
+
+ # any other random options you want to pass to docker
+ DOCKER_OPTS=""
++
++# disable grsecurity features
++#disable_grsec="chroot_deny_chmod chroot_deny_mknod"
diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd
-index 26fa8ef..ea8a3b2 100644
+index f2e1536..20de85b 100644
--- a/contrib/init/openrc/docker.initd
+++ b/contrib/init/openrc/docker.initd
-@@ -9,11 +9,18 @@ DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"
+@@ -9,11 +9,22 @@ DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"
start_stop_daemon_args="--background \
--stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\""
-
+
+grsecdir=/proc/sys/kernel/grsecurity
+
++depend() {
++ need sysfs
++}
++
start_pre() {
checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
+ for i in $disable_grsec; do
@@ -16,19 +31,9 @@ index 26fa8ef..ea8a3b2 100644
+ echo 0 > "$grsecdir/$i"
+ fi
+ done
-
+
ulimit -n 1048576
- ulimit -u 1048576
-
+
return 0
}
-
---- a/contrib/init/openrc/docker.confd 2015-02-10 17:14:37.000000000 -0100
-+++ b/contrib/init/openrc/docker.confd 2015-03-31 14:52:47.323685914 -0200
-@@ -11,3 +11,6 @@
-
- # any other random options you want to pass to docker
- DOCKER_OPTS=""
-+
-+# disable grsecurity features
-+#disable_grsec="chroot_deny_chmod chroot_deny_mknod"