diff options
| author | Eivind Uggedal <eivind@uggedal.com> | 2014-07-05 15:43:25 +0000 |
|---|---|---|
| committer | Eivind Uggedal <eivind@uggedal.com> | 2014-07-05 15:43:25 +0000 |
| commit | ac79d34eaeac1538eea80029678e7cee81ee6814 (patch) | |
| tree | 1545a11e161afb4fb1dc9e50c55224a4d6470d47 /main/docker | |
| parent | 7ccb810725e715b8f26af37e328c0f854af718af (diff) | |
| download | aports-ac79d34eaeac1538eea80029678e7cee81ee6814.tar.bz2 aports-ac79d34eaeac1538eea80029678e7cee81ee6814.tar.xz | |
main/docker: fix ulimit usage in init script
Diffstat (limited to 'main/docker')
| -rw-r--r-- | main/docker/APKBUILD | 12 | ||||
| -rw-r--r-- | main/docker/docker.init-ulimit-fix.patch | 11 |
2 files changed, 19 insertions, 4 deletions
diff --git a/main/docker/APKBUILD b/main/docker/APKBUILD index 6b8201e91d..e380c7d4ba 100644 --- a/main/docker/APKBUILD +++ b/main/docker/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Eivind Uggedal <eivind@uggedal.com> pkgname=docker pkgver=1.1.0 -pkgrel=0 +pkgrel=1 _gitcommit=79812e3 pkgdesc="Pack, ship and run any application as a lightweight container" url="http://www.docker.io/" @@ -20,6 +20,7 @@ subpackages=" source=" $pkgname-$pkgver.tar.gz::https://github.com/dotcloud/docker/archive/v$pkgver.tar.gz http://dev.alpinelinux.org/archive/$pkgname/$pkgname-man-$pkgver.tar.gz + docker.init-ulimit-fix.patch " # Generation of man page source archive: @@ -98,8 +99,11 @@ vim() { } md5sums="c5a6332a12206fc082ddeeca49a9aa28 docker-1.1.0.tar.gz -ac16b6b472607291f52d8030baeb71f5 docker-man-1.1.0.tar.gz" +ac16b6b472607291f52d8030baeb71f5 docker-man-1.1.0.tar.gz +265bb875f508b7aeaa369cd1692b2caa docker.init-ulimit-fix.patch" sha256sums="ab3a5a240442d630a4ed6cbe07e441ddb2c5e5924d2b330a88a28dfb32c44e2c docker-1.1.0.tar.gz -67aa5166a79bc83e4a326dbbf777af84c6c9a2ed958560b9d62442bb122f7f2e docker-man-1.1.0.tar.gz" +67aa5166a79bc83e4a326dbbf777af84c6c9a2ed958560b9d62442bb122f7f2e docker-man-1.1.0.tar.gz +e7c4d5be9ea9090abb531feed91d5d47464283bec66474e263075db211556c72 docker.init-ulimit-fix.patch" sha512sums="ef74256b6645cb4b3038e8daf88e1b26d2c45f073281b642bc0bf07b8e909bcd730deae870f9247b32e030346ddf304c63ba50e83ec066a9906312f681fd46c4 docker-1.1.0.tar.gz -1ffdcb42a85c4672e04f295a0dbf986e8cdf40e8c52a0ec7658ab9c3cb95500e171e6f4af7b0b5926196c7bcc9cf7eaac66ff08f5074883b38fdc41ef9d9c603 docker-man-1.1.0.tar.gz" +1ffdcb42a85c4672e04f295a0dbf986e8cdf40e8c52a0ec7658ab9c3cb95500e171e6f4af7b0b5926196c7bcc9cf7eaac66ff08f5074883b38fdc41ef9d9c603 docker-man-1.1.0.tar.gz +d677d0540d3106b42d7745f61ece8e017301771d808ce81c28378543e13dbf5655092d9c1745e84227159882cd9af8c7211a146c716cb5ed10e6b15438611973 docker.init-ulimit-fix.patch" diff --git a/main/docker/docker.init-ulimit-fix.patch b/main/docker/docker.init-ulimit-fix.patch new file mode 100644 index 0000000000..02e5e86e91 --- /dev/null +++ b/main/docker/docker.init-ulimit-fix.patch @@ -0,0 +1,11 @@ +index a9d21b17089a..8edfaef6378e 100755 +--- a/contrib/init/openrc/docker.initd.orig ++++ b/contrib/init/openrc/docker.initd +@@ -12,7 +12,6 @@ start() { + checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" + + ulimit -n 1048576 +- ulimit -u 1048576 + + ebegin "Starting docker daemon" + start-stop-daemon --start --background \ |