mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-07-28 02:51:11 +08:00
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
--- a/dockerd/Makefile
|
|
+++ b/dockerd/Makefile
|
|
@@ -47,6 +47,8 @@ define Package/dockerd
|
|
+kmod-veth \
|
|
+tini \
|
|
+uci-firewall \
|
|
+ +fuse-overlayfs \
|
|
+ +kmod-vxlan +kmod-macvlan +kmod-dummy +kmod-crypto-gcm +kmod-crypto-seqiv +kmod-crypto-ghash +kmod-ipsec +kmod-nf-nathelper +kmod-nf-nathelper-extra +btrfs-progs \
|
|
@!(mips||mips64||mipsel)
|
|
USERID:=docker:docker
|
|
MENU:=1
|
|
@@ -94,13 +96,13 @@ define Build/Prepare
|
|
$(Build/Prepare/Default)
|
|
|
|
# Verify dependencies are the vendored version
|
|
- $(call EnsureVendoredVersion,../containerd/Makefile,containerd.installer)
|
|
- $(call EnsureVendoredVersion,../runc/Makefile,runc.installer)
|
|
- $(call EnsureVendoredVersion,../tini/Makefile,tini.installer)
|
|
+ $(call EnsureVendoredVersion,../../packages/utils/containerd/Makefile,containerd.installer)
|
|
+ $(call EnsureVendoredVersion,../../packages/utils/runc/Makefile,runc.installer)
|
|
+ $(call EnsureVendoredVersion,../../packages/utils/tini/Makefile,tini.installer)
|
|
|
|
# Verify CLI is the same version
|
|
( \
|
|
- CLI_MAKEFILE="../docker/Makefile"; \
|
|
+ CLI_MAKEFILE="../../packages/utils/docker/Makefile"; \
|
|
CLI_VERSION=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$$$${CLI_MAKEFILE}" ); \
|
|
if [ "$$$${CLI_VERSION}" != "$(PKG_VERSION)" ]; then \
|
|
echo "ERROR: Expected 'PKG_VERSION:=$(PKG_VERSION)' in '$$$${CLI_MAKEFILE}', found 'PKG_VERSION:=$$$${CLI_VERSION}'"; \
|
|
@@ -142,6 +144,9 @@ define Package/dockerd/install
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bundles/binary-daemon/dockerd $(1)/usr/bin/
|
|
$(INSTALL_BIN) $(PKG_BUILD_DIR)/bundles/binary-daemon/docker-proxy $(1)/usr/bin/
|
|
|
|
+ $(INSTALL_DIR) $(1)/etc/uci-defaults
|
|
+ $(INSTALL_DATA) ./files/dockerd.uci-defaults $(1)/etc/uci-defaults/dockerd
|
|
+
|
|
$(INSTALL_DIR) $(1)/opt/docker/
|
|
|
|
ifeq ($(CONFIG_DOCKER_CHECK_CONFIG),y)
|