diff --git a/.github/workflows/openwrt-side.yml b/.github/workflows/openwrt-lede-side.yml similarity index 90% rename from .github/workflows/openwrt-side.yml rename to .github/workflows/openwrt-lede-side.yml index 2be4f2d..b081a92 100644 --- a/.github/workflows/openwrt-side.yml +++ b/.github/workflows/openwrt-lede-side.yml @@ -1,4 +1,4 @@ -name: OpenWRT Side Router +name: OpenWRT LEDE Side Router on: workflow_dispatch: @@ -6,13 +6,13 @@ on: - cron: '31 4,12,20 * * *' env: - DOCKERFILE: openwrt/openwrt/side/Dockerfile.openwrt-side + DOCKERFILE: openwrt/lede/side/Dockerfile.openwrt-lede-side REGION: cn-beijing REGISTRY: registry.cn-beijing.aliyuncs.com NAMESPACE: licsber REPOSITORY: github - TAG: openwrt-side - TAG_FULL: openwrt-side-${{ github.run_id }} + TAG: openwrt-lede-side + TAG_FULL: openwrt-lede-side-${{ github.run_id }} jobs: build: diff --git a/openwrt/openwrt/side/Dockerfile.openwrt-side b/openwrt/lede/side/Dockerfile.openwrt-lede-side similarity index 63% rename from openwrt/openwrt/side/Dockerfile.openwrt-side rename to openwrt/lede/side/Dockerfile.openwrt-lede-side index 46a1a53..e394f31 100644 --- a/openwrt/openwrt/side/Dockerfile.openwrt-side +++ b/openwrt/lede/side/Dockerfile.openwrt-lede-side @@ -1,15 +1,13 @@ -FROM registry.cn-beijing.aliyuncs.com/licsber/github:openwrt-env +FROM registry.cn-beijing.aliyuncs.com/licsber/github:openwrt-lede-env LABEL org.opencontainers.image.authors='licsber' USER licsber -WORKDIR /home/licsber/openwrt +WORKDIR /home/licsber/lede RUN rm -rf bin RUN git pull -COPY --chown=licsber openwrt.side.config .config - -RUN echo 'src-git helloworld https://github.com/fw876/helloworld.git' >> feeds.conf.default +COPY --chown=licsber openwrt.lede.side.config .config RUN ./scripts/feeds update -a RUN ./scripts/feeds install -a @@ -20,7 +18,7 @@ RUN make download -j8 RUN sed -i 's/192.168.1.1/10.24.0.10/g' package/base-files/files/bin/config_generate RUN sed -i 's/255.255.255.0/255.255.254.0/g' package/base-files/files/bin/config_generate RUN sed -i "s/hostname='OpenWrt'/hostname='LicsberSide'/g" package/base-files/files/bin/config_generate -RUN sed -i 's/root:::0:99999:7:::/root:$5$xeM4LFOWSqhQpWWQ$dali1R7FDL8DfMb5atosYIUaMuU6tCQ5Ehwif6yux\/C:19824:0:99999:7:::/g' package/base-files/files/etc/shadow +RUN sed -i "s/timezone='UTC'/timezone='CST-8'/g" package/base-files/files/bin/config_generate ENV GOPROXY='https://goproxy.io,direct' RUN if [ `nproc` -le 4 ]; then make -j2 || make V=s; else make -j `nproc` || make V=s; fi && \ diff --git a/openwrt/lede/side/openwrt.lede.side.config b/openwrt/lede/side/openwrt.lede.side.config new file mode 100644 index 0000000..2b9807c --- /dev/null +++ b/openwrt/lede/side/openwrt.lede.side.config @@ -0,0 +1,32 @@ +CONFIG_TARGET_x86=y +CONFIG_TARGET_x86_64=y +CONFIG_TARGET_x86_64_DEVICE_generic=y + +CONFIG_TARGET_ROOTFS_PARTSIZE=1024 + +# CONFIG_GRUB_IMAGES is not set +CONFIG_GRUB_TITLE="LicsberOpenWRT" + +CONFIG_PACKAGE_python3-pip=y +CONFIG_PACKAGE_python3-requests=y +CONFIG_PACKAGE_python3-speedtest-cli=y + +CONFIG_PACKAGE_golang=y + +CONFIG_PACKAGE_usb-modeswitch=y +CONFIG_PACKAGE_modemmanager=y +# ECM +CONFIG_PACKAGE_luci-proto-ncm=y +# MBIM Qmi +CONFIG_PACKAGE_luci-proto-mbim=y +CONFIG_PACKAGE_umbim=y +CONFIG_PACKAGE_luci-proto-qmi=y +CONFIG_PACKAGE_qmi-utils=y +# NCM +CONFIG_PACKAGE_luci-proto-ncm=y +# RNDIS +CONFIG_PACKAGE_kmod-usb-net-rndis=y +# Quectel +CONFIG_PACKAGE_quectel-CM-5G=y + +CONFIG_PACKAGE_pppoe-discovery=y diff --git a/openwrt/openwrt/side/openwrt.side.config b/openwrt/openwrt/side/openwrt.side.config deleted file mode 100644 index 6ce3393..0000000 --- a/openwrt/openwrt/side/openwrt.side.config +++ /dev/null @@ -1,95 +0,0 @@ -CONFIG_TARGET_x86=y -CONFIG_TARGET_x86_64=y -CONFIG_TARGET_x86_64_DEVICE_generic=y - -CONFIG_TARGET_ROOTFS_PARTSIZE=1024 - -# CONFIG_GRUB_IMAGES is not set -CONFIG_GRUB_TITLE="LicsberOpenWRT" - -CONFIG_PACKAGE_htop=y -CONFIG_PACKAGE_btop=y - -CONFIG_PACKAGE_luci=y -CONFIG_LUCI_LANG_zh_Hans=y -CONFIG_PACKAGE_luci-theme-material=y - -CONFIG_PACKAGE_block-mount=y -CONFIG_PACKAGE_luci-app-hd-idle=y -CONFIG_PACKAGE_luci-app-mwan3=y -CONFIG_PACKAGE_luci-app-netdata=y -CONFIG_PACKAGE_luci-app-openvpn-server=y -CONFIG_PACKAGE_luci-app-serverchan=y -CONFIG_PACKAGE_luci-app-socat=y - -CONFIG_PACKAGE_ddns-scripts-cloudflare=y -CONFIG_PACKAGE_luci-app-cloudflared=y - -CONFIG_PACKAGE_luci-app-dockerman=y -CONFIG_DOCKER_NET_MACVLAN=y -CONFIG_PACKAGE_docker-compose=y - -CONFIG_PACKAGE_lsof=y -CONFIG_PACKAGE_curl=y -CONFIG_PACKAGE_screen=y -CONFIG_PACKAGE_rsync=y -CONFIG_PACKAGE_fdisk=y -CONFIG_PACKAGE_iperf3=y - -CONFIG_PACKAGE_tc-full=y -CONFIG_PACKAGE_vxlan=y -CONFIG_PACKAGE_gre=y -CONFIG_PACKAGE_xl2tpd=y -CONFIG_PACKAGE_pppossh=y -CONFIG_PACKAGE_pppoe-discovery=y - -CONFIG_PACKAGE_python3-pip=y -CONFIG_PACKAGE_python3-requests=y -CONFIG_PACKAGE_python3-speedtest-cli=y - -CONFIG_PACKAGE_golang=y - -CONFIG_LIBQMI_COLLECTION_BASIC=y -CONFIG_LIBQMI_WITH_MBIM_QMUX=y -CONFIG_LIBQMI_WITH_QRTR_GLIB=y -CONFIG_MODEMMANAGER_WITH_MBIM=y -CONFIG_MODEMMANAGER_WITH_QMI=y -CONFIG_MODEMMANAGER_WITH_QRTR=y -CONFIG_PACKAGE_chat=y -CONFIG_PACKAGE_comgt=y -CONFIG_PACKAGE_comgt-ncm=y -CONFIG_PACKAGE_dbus=y -CONFIG_PACKAGE_glib2=y -CONFIG_PACKAGE_kmod-usb-core=y -CONFIG_PACKAGE_kmod-usb-net=y -CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y -CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y -CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y -CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y -CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y -CONFIG_PACKAGE_kmod-usb-net-rndis=y -CONFIG_PACKAGE_kmod-usb-serial=y -CONFIG_PACKAGE_kmod-usb-serial-option=y -CONFIG_PACKAGE_kmod-usb-serial-wwan=y -CONFIG_PACKAGE_kmod-usb-wdm=y -CONFIG_PACKAGE_libatomic=y -CONFIG_PACKAGE_libattr=y -CONFIG_PACKAGE_libdbus=y -CONFIG_PACKAGE_libexpat=y -CONFIG_PACKAGE_libffi=y -CONFIG_PACKAGE_libmbim=y -CONFIG_PACKAGE_libpcre2=y -CONFIG_PACKAGE_libqmi=y -CONFIG_PACKAGE_libqrtr-glib=y -CONFIG_PACKAGE_libusb-1.0=y -CONFIG_PACKAGE_luci-proto-mbim=y -CONFIG_PACKAGE_luci-proto-ncm=y -CONFIG_PACKAGE_luci-proto-qmi=y -CONFIG_PACKAGE_modemmanager=y -CONFIG_PACKAGE_qmi-utils=y -CONFIG_PACKAGE_umbim=y -CONFIG_PACKAGE_uqmi=y -CONFIG_PACKAGE_usb-modeswitch=y -CONFIG_PACKAGE_wwan=y -CONFIG_PACKAGE_zlib=y -CONFIG_PCRE2_JIT_ENABLED=y