aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolf <wolf@wolfsden.cz>2021-04-27 01:49:24 +0200
committerLeo <thinkabit.ukim@gmail.com>2021-04-30 05:00:44 +0000
commitee8be104b786b1cd8fd7cdd82db2b0b213fa1f76 (patch)
treecc171dad22222830d617e39628dc6130e553da85
parentfa692d92996db6f97089991378f17e80d930fc16 (diff)
downloadaports-ee8be104b786b1cd8fd7cdd82db2b0b213fa1f76.tar.gz
aports-ee8be104b786b1cd8fd7cdd82db2b0b213fa1f76.tar.bz2
aports-ee8be104b786b1cd8fd7cdd82db2b0b213fa1f76.tar.xz
community/docker: fix race condition between docker and iptables
When the system is booting, the order of docker and iptables was not specified due to the missing dependency. That could lead to docker setting up the chains and iptables wiping them clean if the order of start was 1. docker 2. iptables. Explicit dependency should make that working correctly.
-rw-r--r--community/docker/APKBUILD4
-rw-r--r--community/docker/docker.initd1
2 files changed, 3 insertions, 2 deletions
diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD
index df84d7fdda..52acc67986 100644
--- a/community/docker/APKBUILD
+++ b/community/docker/APKBUILD
@@ -5,7 +5,7 @@ pkgname=docker
pkgver=20.10.6
_cli_commit=370c28948e3c12dce3d1df60b6f184990618553f # https://github.com/docker/cli/commits/v$pkgver
_moby_commit=8728dd246c3ab53105434eef8ffe997b6fd14dc6 # https://github.com/moby/moby/commits/v$pkgver
-pkgrel=0
+pkgrel=1
pkgdesc="Pack, ship and run any application as a lightweight container"
url="https://www.docker.io/"
arch="all"
@@ -197,5 +197,5 @@ sha512sums="6b0ed4c756418cd38f9e5d614910a5b4fc3b2bc286f7e69950e031c5c571c705d7b7
ade6307fe31a3b8f144898ab9c4f2db965965294f15e313b0080ce7aa8bf3296f6f34912b45926ac8c5e74eaf475eef869072878123d27aa432e955f594a94ab moby-20.10.6.tar.gz
93339b4720069b50589021e8769d8820d195ea076655f23c6f35b18e52d5ca6e1a8b84cd1a6941ce9728028e807e5248a86d302c99b7158d2e1514eb7c8a3d7f libnetwork-b3507428be5b458cb0e2b4086b13531fb0706e46.tar.gz
a27debc5c971f468e672826659e5c46946187e2307dded8c496084b9fabc5602e68bdfdc08f444f42d6f82f0f2704d01a0c4bde3e5fbe674c7cb14309f0a3328 cobra-1.1.1.tar.gz
-e3a882a732f498ea62a770e1d91cfb910d4206156dd9a8546cf6af94dcb9c6201e0f712a86e3ad352fbae4f0eedb2b4055976af69385c671dc8e9a43b78bc31b docker.initd
+4d03065e3bf5261dba5f02848c60ac790149f79985c9819814b576fafb8dcd86af0c78a58041cd676cf9e570fbc74bfd382647351db73ed2765f4395522de15b docker.initd
f25523f43376ccef71a49618e556e0a16db3acad29eb09fe86c4e572562bdea0bc1eabab00159278835ad9d7c007f2cd10b2ed31f7213b0d9074582dc80a976f docker.confd"
diff --git a/community/docker/docker.initd b/community/docker/docker.initd
index aa35285223..44c59d7c75 100644
--- a/community/docker/docker.initd
+++ b/community/docker/docker.initd
@@ -20,6 +20,7 @@ retry="${DOCKER_RETRY:-TERM/60/KILL/10}"
depend() {
need sysfs cgroups
+ after iptables ip6tables
}
start_pre() {