From 1f96ec16ecdb98b83244b4c97faf314552948924 Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Wed, 27 Apr 2022 21:11:14 +1000 Subject: dockerd: Add firewall independent dependencies Signed-off-by: Gerard Ryan --- utils/dockerd/Makefile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'utils/dockerd/Makefile') diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 7b0cc294e..c2cc43db7 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -34,22 +34,20 @@ define Package/dockerd TITLE:=Docker Community Edition Daemon URL:=https://www.docker.com/ DEPENDS:=$(GO_ARCH_DEPENDS) \ - +btrfs-progs \ +ca-certificates \ +containerd \ - +iptables-legacy \ + +iptables \ +iptables-mod-extra \ - +iptables-mod-nat-extra \ + +IPV6:ip6tables \ + +IPV6:kmod-ipt-nat6 \ +KERNEL_SECCOMP:libseccomp \ - +kmod-br-netfilter \ - +kmod-ikconfig \ - +kmod-nf-conntrack-netlink \ + +kmod-ipt-nat \ + +kmod-ipt-physdev \ +kmod-nf-ipvs \ - +kmod-nf-nat \ +kmod-veth \ - +libdevmapper \ +libnetwork \ - +tini + +tini \ + +uci-firewall USERID:=docker:docker MENU:=1 endef @@ -146,8 +144,11 @@ define Package/dockerd/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/bundles/binary-daemon/dockerd $(1)/usr/bin/ $(INSTALL_DIR) $(1)/opt/docker/ + + ifeq ($(CONFIG_DOCKER_CHECK_CONFIG),y) $(INSTALL_DIR) $(1)/usr/share/docker/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/contrib/check-config.sh $(1)/usr/share/docker/ + endif $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dockerd.init $(1)/etc/init.d/dockerd -- cgit v1.2.3