From c65dd0a43ea7bf486135283ab4fd14918cf4615e Mon Sep 17 00:00:00 2001 From: hugoyue Date: Wed, 24 Aug 2022 11:28:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BAx86=E8=AE=BE=E5=A4=87=E7=A7=BB?= =?UTF-8?q?=E9=99=A4docker/=E6=89=A9=E5=B1=95=E5=86=85=E6=A0=B8=E5=88=86?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- config/x86_64.config | 59 ++++--------------------------------- devices/x86_64/diy-part2.sh | 1 - 3 files changed, 7 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 36acfcb..5e60185 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Auto Build OpenWrt for x86_64/HC5962/C526a/K2p（OpenWrt 固件云编译） ## 介绍 -- X86_64 固件大小 832MB (squashfs+EXT4)；默认主题为 Argon ，x86_64 固件除了对PassWall、Clash、AdGuardHome（广告拦截）、Appfilter（应用过滤）、ZeroTier 等热门插件的支持外，集成了常用的命令行工具，如socat、iper3、curl、nano 等便于自身维护。 +- X86_64 固件大小 928MB (squashfs+EXT4)；默认主题为 Argon ，x86_64 固件除了对PassWall、Clash、AdGuardHome（广告拦截）、Appfilter（应用过滤）、ZeroTier 等热门插件的支持外，集成了常用的命令行工具，如socat、iper3、curl、nano 等便于自身维护。 - 除 x86_64 平台外的其它固件均有所精简。 - 默认 Lan IP: `192.168.199.1 ` 账号/密码 `root / password` diff --git a/config/x86_64.config b/config/x86_64.config index 72c0fa9..17e3534 100644 --- a/config/x86_64.config +++ b/config/x86_64.config @@ -6,18 +6,8 @@ CONFIG_ARIA2_NOXML=y CONFIG_ARIA2_OPENSSL=y CONFIG_ARIA2_WEBSOCKET=y CONFIG_BIND_ENABLE_DOH=y -CONFIG_DOCKER_CGROUP_OPTIONS=y -CONFIG_DOCKER_NET_MACVLAN=y -CONFIG_DOCKER_STO_EXT4=y # CONFIG_GRUB_EFI_IMAGES is not set CONFIG_GRUB_IMAGES=y -CONFIG_KERNEL_CGROUP_DEVICE=y -CONFIG_KERNEL_CGROUP_FREEZER=y -CONFIG_KERNEL_CGROUP_NET_PRIO=y -CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y -CONFIG_KERNEL_EXT4_FS_SECURITY=y -CONFIG_KERNEL_FS_POSIX_ACL=y -CONFIG_KERNEL_NET_CLS_CGROUP=y CONFIG_PACKAGE_6in4=y # CONFIG_PACKAGE_UnblockNeteaseMusic-Go is not set CONFIG_PACKAGE_acpid=y @@ -36,17 +26,12 @@ CONFIG_PACKAGE_boost=y CONFIG_PACKAGE_boost-program_options=y CONFIG_PACKAGE_boost-system=y CONFIG_PACKAGE_brook=y -CONFIG_PACKAGE_btrfs-progs=y -CONFIG_PACKAGE_cgroupfs-mount=y CONFIG_PACKAGE_chinadns-ng=y -CONFIG_PACKAGE_containerd=y CONFIG_PACKAGE_coreutils-nohup=y CONFIG_PACKAGE_dbus=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y CONFIG_PACKAGE_dnsforwarder=y CONFIG_PACKAGE_dnsproxy=y -CONFIG_PACKAGE_docker=y -CONFIG_PACKAGE_dockerd=y CONFIG_PACKAGE_fdisk=y CONFIG_PACKAGE_frpc=y CONFIG_PACKAGE_fuse-utils=y @@ -61,37 +46,18 @@ CONFIG_PACKAGE_iptables-mod-ipopt=y CONFIG_PACKAGE_iputils-arping=y CONFIG_PACKAGE_ipv6helper=y CONFIG_PACKAGE_jq=y -CONFIG_PACKAGE_kcptun-client=y -CONFIG_PACKAGE_kcptun-config=y CONFIG_PACKAGE_kmod-ac97=y -CONFIG_PACKAGE_kmod-asn1-encoder=y -CONFIG_PACKAGE_kmod-br-netfilter=y # CONFIG_PACKAGE_kmod-crypto-kpp is not set -CONFIG_PACKAGE_kmod-crypto-rng=y -CONFIG_PACKAGE_kmod-crypto-sha256=y -CONFIG_PACKAGE_kmod-dax=y -CONFIG_PACKAGE_kmod-dm=y -CONFIG_PACKAGE_kmod-dummy=y CONFIG_PACKAGE_kmod-fast-classifier=y -CONFIG_PACKAGE_kmod-fs-btrfs=y CONFIG_PACKAGE_kmod-fuse=y CONFIG_PACKAGE_kmod-ifb=y -CONFIG_PACKAGE_kmod-ikconfig=y CONFIG_PACKAGE_kmod-inet-diag=y CONFIG_PACKAGE_kmod-ipt-ipopt=y CONFIG_PACKAGE_kmod-ipt-nat6=y CONFIG_PACKAGE_kmod-iptunnel=y -CONFIG_PACKAGE_kmod-keys-encrypted=y -CONFIG_PACKAGE_kmod-keys-trusted=y CONFIG_PACKAGE_kmod-ledtrig-audio=y -CONFIG_PACKAGE_kmod-lib-raid6=y -CONFIG_PACKAGE_kmod-lib-xor=y -CONFIG_PACKAGE_kmod-lib-zstd=y -CONFIG_PACKAGE_kmod-nf-ipvs=y +# CONFIG_PACKAGE_kmod-nf-conntrack-netlink is not set CONFIG_PACKAGE_kmod-nf-nat6=y -CONFIG_PACKAGE_kmod-oaf=y -CONFIG_PACKAGE_kmod-oid-registry=y -CONFIG_PACKAGE_kmod-random-core=y CONFIG_PACKAGE_kmod-regmap-core=y CONFIG_PACKAGE_kmod-sched-cake=y CONFIG_PACKAGE_kmod-sched-core=y @@ -106,35 +72,27 @@ CONFIG_PACKAGE_kmod-sound-hda-intel=y CONFIG_PACKAGE_kmod-sound-i8x0=y CONFIG_PACKAGE_kmod-sound-mpu401=y CONFIG_PACKAGE_kmod-sound-via82xx=y -CONFIG_PACKAGE_kmod-tpm=y CONFIG_PACKAGE_kmod-usb-audio=y -CONFIG_PACKAGE_kmod-veth=y # CONFIG_PACKAGE_kmod-wireguard is not set CONFIG_PACKAGE_libatomic=y -CONFIG_PACKAGE_libattr=y CONFIG_PACKAGE_libavahi-client=y CONFIG_PACKAGE_libavahi-dbus-support=y CONFIG_PACKAGE_libcap-bin=y CONFIG_PACKAGE_libcap-bin-capsh-shell="/bin/sh" CONFIG_PACKAGE_libconfig=y CONFIG_PACKAGE_libdaemon=y -CONFIG_PACKAGE_libdb47=y CONFIG_PACKAGE_libdbus=y -CONFIG_PACKAGE_libdevmapper=y CONFIG_PACKAGE_libexpat=y CONFIG_PACKAGE_libfuse=y CONFIG_PACKAGE_libltdl=y CONFIG_PACKAGE_liblua5.3=y -CONFIG_PACKAGE_liblzo=y -CONFIG_PACKAGE_libnetwork=y CONFIG_PACKAGE_libnghttp2=y CONFIG_PACKAGE_libpopt=y CONFIG_PACKAGE_libruby=y -CONFIG_PACKAGE_libseccomp=y CONFIG_PACKAGE_libsoxr=y CONFIG_PACKAGE_libyaml=y -CONFIG_PACKAGE_libzstd=y CONFIG_PACKAGE_lsblk=y +# CONFIG_PACKAGE_lua-neturl is not set CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-advanced=y CONFIG_PACKAGE_luci-app-airplay2=y @@ -147,9 +105,9 @@ CONFIG_PACKAGE_luci-app-aria2=y # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Shadowsocks_Libev_Server is not set # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Simple_Obfs is not set # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Socks_Server is not set +# CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Trojan is not set # CONFIG_PACKAGE_luci-app-bypass_INCLUDE_Xray is not set # CONFIG_PACKAGE_luci-app-diskman_INCLUDE_lsblk is not set -CONFIG_PACKAGE_luci-app-dockerman=y CONFIG_PACKAGE_luci-app-eqos=y CONFIG_PACKAGE_luci-app-frpc=y # CONFIG_PACKAGE_luci-app-nlbwmon is not set @@ -175,10 +133,12 @@ CONFIG_PACKAGE_luci-app-qbittorrent=y CONFIG_PACKAGE_luci-app-rclone=y CONFIG_PACKAGE_luci-app-sqm=y # CONFIG_PACKAGE_luci-app-ssr-plus is not set +CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_NONE_V2RAY=y # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Client is not set # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Libev_Server is not set # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks_Libev_Server is not set # CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Simple_Obfs is not set +# CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Xray is not set CONFIG_PACKAGE_luci-app-tencentddns=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_DNSFORWARDER=y CONFIG_PACKAGE_luci-app-turboacc_INCLUDE_DNSPROXY=y @@ -202,7 +162,6 @@ CONFIG_PACKAGE_luci-i18n-airplay2-zh-cn=y CONFIG_PACKAGE_luci-i18n-aliddns-zh-cn=y CONFIG_PACKAGE_luci-i18n-argon-config-zh-cn=y CONFIG_PACKAGE_luci-i18n-aria2-zh-cn=y -CONFIG_PACKAGE_luci-i18n-dockerman-zh-cn=y CONFIG_PACKAGE_luci-i18n-eqos-zh-cn=y CONFIG_PACKAGE_luci-i18n-frpc-zh-cn=y CONFIG_PACKAGE_luci-i18n-oaf-zh-cn=y @@ -212,11 +171,9 @@ CONFIG_PACKAGE_luci-i18n-rclone-zh-cn=y CONFIG_PACKAGE_luci-i18n-sqm-zh-cn=y CONFIG_PACKAGE_luci-i18n-uhttpd-zh-cn=y CONFIG_PACKAGE_luci-i18n-watchcat-zh-cn=y -CONFIG_PACKAGE_luci-lib-docker=y CONFIG_PACKAGE_luci-proto-ipv6=y # CONFIG_PACKAGE_luci-proto-wireguard is not set CONFIG_PACKAGE_luci-theme-bootstrap=y -CONFIG_PACKAGE_mount-utils=y CONFIG_PACKAGE_naiveproxy=y CONFIG_PACKAGE_nano=y # CONFIG_PACKAGE_nlbwmon is not set @@ -241,7 +198,6 @@ CONFIG_PACKAGE_ruby-psych=y CONFIG_PACKAGE_ruby-stringio=y CONFIG_PACKAGE_ruby-strscan=y CONFIG_PACKAGE_ruby-yaml=y -CONFIG_PACKAGE_runc=y CONFIG_PACKAGE_shadowsocks-libev-ss-local=y CONFIG_PACKAGE_shadowsocks-libev-ss-redir=y CONFIG_PACKAGE_shadowsocks-rust-sslocal=y @@ -250,9 +206,7 @@ CONFIG_PACKAGE_shadowsocks-rust-ssserver=y CONFIG_PACKAGE_shairport-sync-openssl=y CONFIG_PACKAGE_socat=y CONFIG_PACKAGE_sqm-scripts=y -CONFIG_PACKAGE_tc-mod-iptables=y CONFIG_PACKAGE_tc-tiny=y -CONFIG_PACKAGE_tini=y CONFIG_PACKAGE_trojan-go=y CONFIG_PACKAGE_trojan-plus=y CONFIG_PACKAGE_unzip=y @@ -266,11 +220,10 @@ CONFIG_TARGET_EXT4_BLOCKSIZE=4096 CONFIG_TARGET_EXT4_BLOCKSIZE_4K=y CONFIG_TARGET_EXT4_RESERVED_PCT=0 CONFIG_TARGET_IMAGES_GZIP=y -CONFIG_TARGET_KERNEL_PARTSIZE=32 +CONFIG_TARGET_KERNEL_PARTSIZE=128 CONFIG_TARGET_ROOTFS_EXT4FS=y CONFIG_TARGET_ROOTFS_PARTSIZE=800 # CONFIG_VMDK_IMAGES is not set -CONFIG_ZSTD_OPTIMIZE_O3=y CONFIG_boost-compile-visibility-hidden=y CONFIG_boost-runtime-shared=y CONFIG_boost-static-and-shared-libs=y diff --git a/devices/x86_64/diy-part2.sh b/devices/x86_64/diy-part2.sh index a146f99..d13d5b4 100644 --- a/devices/x86_64/diy-part2.sh +++ b/devices/x86_64/diy-part2.sh @@ -22,6 +22,5 @@ sed -i 's/luci-theme-bootstrap/luci-theme-argon/' feeds/luci/collections/luci/Ma # Add Packages git clone https://github.com/destan19/OpenAppFilter package/OpenAppFilter -git clone https://github.com/lisaac/luci-app-dockerman package/luci-app-dockerman git clone https://github.com/MapesxGM/luci-app-tencentddns package/luci-app-tencentddns git clone https://github.com/jerrykuku/luci-app-argon-config package/luci-app-argon-config