just OpenWrt with ubuntu

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim AS base
+FROM ubuntu:22.04 AS base
 
 LABEL maintainer="OpenWrt Builder"
 

Dockerfile.immortalwrt

@@ -1,29 +0,0 @@
-FROM debian:bookworm-slim AS base
-
-LABEL maintainer="OpenWrt Builder"
-
-# Install required dependencies
-COPY ./dependencies.sh /install_dependencies
-RUN chmod +x /install_dependencies && \
-    /install_dependencies && \
-    rm -rf /install_dependencies
-
-# Create a non-root user for building
-RUN useradd -G sudo -m -u 1000 builder
-
-USER builder
-WORKDIR /home/builder
-
-FROM base
-
-RUN git clone --depth=1 https://github.com/immortalwrt/immortalwrt openwrt
-
-COPY mods/ath.mk openwrt/package/kernel/mac80211/ath.mk
-COPY mods/netdevices.mk openwrt/package/kernel/linux/modules/netdevices.mk
-COPY mods/power openwrt/package/base-files/files/etc/rc.button/power
-
-
-RUN openwrt/scripts/feeds update -a && \
-    openwrt/scripts/feeds install -a
-
-CMD ["/bin/bash"]

Dockerfile.lkiuyu

@@ -1,27 +0,0 @@
-FROM debian:bookworm-slim AS base
-
-LABEL maintainer="OpenWrt Builder"
-
-# Install required dependencies
-COPY ./dependencies.sh /install_dependencies
-RUN chmod +x /install_dependencies && \
-    /install_dependencies && \
-    rm -rf /install_dependencies
-
-# Create a non-root user for building
-RUN useradd -G sudo -m -u 1000 builder
-
-USER builder
-WORKDIR /home/builder
-
-FROM base
-
-RUN git clone --depth=1 https://github.com/lkiuyu/immortalwrt openwrt
-
-# Restoring default feeds.
-COPY mods/feeds.conf.default openwrt/
-
-RUN openwrt/scripts/feeds update -a && \
-    openwrt/scripts/feeds install -a
-
-CMD ["/bin/bash"]

configs/immortal_diffconfig

@@ -1,58 +0,0 @@
-CONFIG_TARGET_msm89xx=y
-CONFIG_TARGET_msm89xx_msm8916=y
-CONFIG_TARGET_msm89xx_msm8916_DEVICE_yiming-uz801v3=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_NETIFD=y
-CONFIG_MODEMMANAGER_WITH_QMI=y
-CONFIG_MODEMMANAGER_WITH_QRTR=y
-CONFIG_PACKAGE_cgi-io=y
-CONFIG_PACKAGE_dbus=y
-CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_kmod-usb-gadget-mass-storage=y
-CONFIG_PACKAGE_kmod-usb-gadget-ncm=y
-CONFIG_PACKAGE_kmod-usb-gadget-serial=y
-CONFIG_PACKAGE_libattr=y
-CONFIG_PACKAGE_libdbus=y
-CONFIG_PACKAGE_libexpat=y
-CONFIG_PACKAGE_libffi=y
-CONFIG_PACKAGE_liblucihttp=y
-CONFIG_PACKAGE_liblucihttp-ucode=y
-CONFIG_PACKAGE_libmbim=y
-CONFIG_PACKAGE_libpcre2=y
-CONFIG_PACKAGE_libqmi=y
-CONFIG_PACKAGE_libqrtr-glib=y
-CONFIG_PACKAGE_luci=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-package-manager=y
-CONFIG_PACKAGE_luci-base=y
-CONFIG_PACKAGE_luci-light=y
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-mod-network=y
-CONFIG_PACKAGE_luci-mod-status=y
-CONFIG_PACKAGE_luci-mod-system=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-CONFIG_PACKAGE_luci-proto-modemmanager=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-theme-bootstrap=y
-CONFIG_PACKAGE_modemmanager=y
-CONFIG_PACKAGE_msm8916-usb-gadget=y
-CONFIG_PACKAGE_nano=y
-CONFIG_PACKAGE_qmi-utils=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-file=y
-CONFIG_PACKAGE_rpcd-mod-iwinfo=y
-CONFIG_PACKAGE_rpcd-mod-luci=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_rpcd-mod-ucode=y
-CONFIG_PACKAGE_ucode-mod-html=y
-CONFIG_PACKAGE_ucode-mod-log=y
-CONFIG_PACKAGE_ucode-mod-math=y
-CONFIG_PACKAGE_uhttpd=y
-CONFIG_PACKAGE_uhttpd-mod-ubus=y
-# CONFIG_TARGET_IMAGES_GZIP is not set
-# CONFIG_TARGET_ROOTFS_SQUASHFS is not set
-# CONFIG_PACKAGE_libncurses is not set
-# CONFIG_PACKAGE_terminfo is not set

configs/lkiuyu_diffconfig

@@ -1,87 +0,0 @@
-CONFIG_TARGET_msm89xx=y
-CONFIG_TARGET_msm89xx_msm8916=y
-CONFIG_TARGET_msm89xx_msm8916_DEVICE_yiming-uz801v3=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_NETIFD=y
-CONFIG_MODEMMANAGER_WITH_QMI=y
-CONFIG_MODEMMANAGER_WITH_QRTR=y
-CONFIG_PACKAGE_cgi-io=y
-CONFIG_PACKAGE_dbus=y
-CONFIG_PACKAGE_debugfs=y
-CONFIG_PACKAGE_default-settings=y
-CONFIG_PACKAGE_glib2=y
-CONFIG_PACKAGE_ip-tiny=y
-CONFIG_PACKAGE_kmod-crypto-lib-chacha20=y
-CONFIG_PACKAGE_kmod-crypto-lib-chacha20poly1305=y
-CONFIG_PACKAGE_kmod-crypto-lib-curve25519=y
-CONFIG_PACKAGE_kmod-crypto-lib-poly1305=y
-CONFIG_PACKAGE_kmod-mii=y
-CONFIG_PACKAGE_kmod-tun=y
-CONFIG_PACKAGE_kmod-udptunnel4=y
-CONFIG_PACKAGE_kmod-udptunnel6=y
-CONFIG_PACKAGE_kmod-usb-core=y
-CONFIG_PACKAGE_kmod-usb-gadget-mass-storage=y
-CONFIG_PACKAGE_kmod-usb-gadget-ncm=y
-CONFIG_PACKAGE_kmod-usb-gadget-serial=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-qmi-wwan=y
-CONFIG_PACKAGE_kmod-usb-wdm=y
-CONFIG_PACKAGE_kmod-wireguard=y
-CONFIG_PACKAGE_libattr=y
-CONFIG_PACKAGE_libdbus=y
-CONFIG_PACKAGE_libexpat=y
-CONFIG_PACKAGE_libffi=y
-CONFIG_PACKAGE_liblucihttp=y
-CONFIG_PACKAGE_liblucihttp-ucode=y
-CONFIG_PACKAGE_libmbim=y
-CONFIG_PACKAGE_libncurses=y
-CONFIG_PACKAGE_libpcre2=y
-CONFIG_PACKAGE_libqmi=y
-CONFIG_PACKAGE_libqrtr-glib=y
-CONFIG_PACKAGE_luci=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-package-manager=y
-CONFIG_PACKAGE_luci-base=y
-CONFIG_PACKAGE_luci-lib-uqr=y
-CONFIG_PACKAGE_luci-light=y
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-mod-network=y
-CONFIG_PACKAGE_luci-mod-status=y
-CONFIG_PACKAGE_luci-mod-system=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-CONFIG_PACKAGE_luci-proto-modemmanager=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-proto-qmi=y
-CONFIG_PACKAGE_luci-proto-wireguard=y
-CONFIG_PACKAGE_luci-theme-bootstrap=y
-CONFIG_PACKAGE_modemmanager=y
-CONFIG_PACKAGE_msm8916-usb-gadget=y
-CONFIG_PACKAGE_mtools=y
-CONFIG_PACKAGE_nano=y
-CONFIG_PACKAGE_qmi-utils=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-file=y
-CONFIG_PACKAGE_rpcd-mod-iwinfo=y
-CONFIG_PACKAGE_rpcd-mod-luci=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_rpcd-mod-ucode=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_ucode-mod-html=y
-CONFIG_PACKAGE_ucode-mod-log=y
-CONFIG_PACKAGE_ucode-mod-math=y
-CONFIG_PACKAGE_uhttpd=y
-CONFIG_PACKAGE_uhttpd-mod-ubus=y
-CONFIG_PACKAGE_umbim=y
-CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_wireguard-tools=y
-CONFIG_PACKAGE_wwan=y
-# CONFIG_TARGET_IMAGES_GZIP is not set
-# CONFIG_TARGET_ROOTFS_SQUASHFS is not set
-# CONFIG_PACKAGE_kmod-crypto-kpp is not set

dependencies.sh

@@ -33,7 +33,6 @@ apt-get update && apt-get install -y --no-install-recommends \
     tar \
     unzip \
     wget \
-    # which \
     gettext \
     xsltproc \
     sudo \

docker-compose.yml

@@ -11,9 +11,7 @@ services:
     restart: "no"
 
   builder:
-    build: 
+    build: .
-      context: .
-      dockerfile: Dockerfile.openwrt
     container_name: openwrt-builder
     working_dir: /home/builder/openwrt
     stdin_open: true