diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-07-24 18:01:57 +0200 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-07-24 18:02:45 +0200 |
| commit | e71355cd672054869dccee6ae600bfda74e46cd4 (patch) | |
| tree | 1de3799b487085dbc31438bf59a67c5d616a87c4 | |
| parent | cd02476ae9ef07c688b1c97d272ed1732de2daef (diff) | |
| download | aports-e71355cd672054869dccee6ae600bfda74e46cd4.tar.bz2 aports-e71355cd672054869dccee6ae600bfda74e46cd4.tar.xz | |
community/docker: busybox >= 1.31.0 renamed ulimit -p to -u
See: https://git.busybox.net/busybox/commit/?id=a92a9601f89d59597b268e29e7098597a8766778
| -rw-r--r-- | community/docker/APKBUILD | 6 | ||||
| -rw-r--r-- | community/docker/docker-openrc-busybox-ash.patch | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD index 63c7378e51..7550edc4eb 100644 --- a/community/docker/APKBUILD +++ b/community/docker/APKBUILD @@ -5,7 +5,7 @@ pkgname=docker pkgver=19.03.0 _gitcommit=aeac9490dc54c1d48b3d7ae9a46f5a19b78dcd3a # https://github.com/docker/docker-ce/commits/v$pkgver _ver=${pkgver/_/-}-ce -pkgrel=0 +pkgrel=1 pkgdesc="Pack, ship and run any application as a lightweight container" url="http://www.docker.io/" arch="all" @@ -41,7 +41,6 @@ source=" libnetwork-$_libnetwork_ver.tar.gz::https://github.com/docker/libnetwork/archive/$_libnetwork_ver.tar.gz cobra-$_cobra_ver.tar.gz::https://github.com/spf13/cobra/archive/v$_cobra_ver.tar.gz docker-openrc-fixes.patch - docker-openrc-busybox-ash.patch " _dockerdir="$srcdir"/docker-$_ver @@ -215,5 +214,4 @@ cli_vim() { sha512sums="ae843ef3d634b5e8e9e3e03890269aaa4edd01d9d2f5a8a6343c8c224a79f5df7c47aad6c59ea45b6aaac6aa0b0348d9ac54b76f037be742c0b4ed9dd160010b docker-19.03.0.tar.gz dea31fd82ab2d445fbd39fe15550a91f7e489a06f6dedd32ea1925f7e9a7971952d26b874f9687249609a0d204ea35da357e0a957b819df2026a0cf8109cb354 libnetwork-fc5a7d91d54cc98f64fc28f9e288b46a0bee756c.tar.gz c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb cobra-0.0.3.tar.gz -d796e6dcab6443a84064f3439dde46bc7e1989e1b52910b3e80a0af0ae1ddd288f0306a24c8d31032e24f5fd4218d2f25614752021355441f118ba2b524cfbd1 docker-openrc-fixes.patch -fe79b65da989af9f579edf94763883793d479855b915a8ff217f75af3c3671f9d3e4beec63c4346df67dbfa6e38d4f9a1187efd5f1b7fca895700852dcffd871 docker-openrc-busybox-ash.patch" +d796e6dcab6443a84064f3439dde46bc7e1989e1b52910b3e80a0af0ae1ddd288f0306a24c8d31032e24f5fd4218d2f25614752021355441f118ba2b524cfbd1 docker-openrc-fixes.patch" diff --git a/community/docker/docker-openrc-busybox-ash.patch b/community/docker/docker-openrc-busybox-ash.patch deleted file mode 100644 index 1f2b2de3d1..0000000000 --- a/community/docker/docker-openrc-busybox-ash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/contrib/init/openrc/docker.initd -+++ b/contrib/init/openrc/docker.initd -@@ -13,7 +13,7 @@ - - extra_started_commands="reload" - --rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -u unlimited}" -+rc_ulimit="${DOCKER_ULIMIT:--c unlimited -n 1048576 -p unlimited}" - - retry="${DOCKER_RETRY:-TERM/60/KILL/10}" - |