diff --git a/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 b/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 index 3dfe1ad..1dffa7c 100644 --- a/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 +++ b/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 @@ -18,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/hostname='OpenWrt'/hostname='LicsberLEDE'/g" package/base-files/files/bin/config_generate -RUN sed -i "s/timezone='UTC'/timezone='Asia\/Shanghai'/g" package/base-files/files/bin/config_generate +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 -j3 || make V=s; else make -j `nproc` || make V=s; fi && \ diff --git a/openwrt/openwrt/env/Dockerfile.openwrt-env b/openwrt/openwrt/env/Dockerfile.openwrt-env index 69979d3..eba5858 100644 --- a/openwrt/openwrt/env/Dockerfile.openwrt-env +++ b/openwrt/openwrt/env/Dockerfile.openwrt-env @@ -7,8 +7,8 @@ RUN lscpu && \ apt install -y -qq build-essential clang flex bison g++ gawk \ gcc-multilib g++-multilib gettext git libncurses-dev libssl-dev \ python3-distutils rsync unzip zlib1g-dev file wget \ - python3-dev \ - python3-setuptools libelf-dev python3-pyelftools swig \ + python3-dev python3-setuptools \ + libelf-dev python3-pyelftools swig \ screenfetch tree && \ apt clean > /dev/null && \ rm -rf /var/lib/apt/list/* && \ @@ -26,17 +26,16 @@ RUN git clone https://github.com/openwrt/openwrt.git WORKDIR /home/licsber/openwrt COPY --chown=licsber files/ files/ -RUN tree -# COPY --chown=licsber openwrt.env.config .config +COPY --chown=licsber openwrt.env.config .config -# RUN ./scripts/feeds update -a -# RUN ./scripts/feeds install -a -# -# RUN make defconfig -# RUN make download -j8 +RUN ./scripts/feeds update -a +RUN ./scripts/feeds install -a -# RUN make -j3 || make V=s +RUN make defconfig +RUN make download -j8 -# RUN tree -h bin +RUN make -j3 || make V=s + +RUN tree -h bin | tee tree.env CMD ["echo", "Hello from LicsberLab!~"] diff --git a/openwrt/openwrt/env/files/etc/config/dropbear b/openwrt/openwrt/env/files/etc/config/dropbear new file mode 100644 index 0000000..5992e11 --- /dev/null +++ b/openwrt/openwrt/env/files/etc/config/dropbear @@ -0,0 +1,5 @@ +config dropbear + option Port '22' + option RootPasswordAuth 'off' + option GatewayPorts 'on' + option PasswordAuth 'off' diff --git a/openwrt/openwrt/n11/Dockerfile.openwrt-n11 b/openwrt/openwrt/n11/Dockerfile.openwrt-n11 index 86e7a3e..02e00e4 100644 --- a/openwrt/openwrt/n11/Dockerfile.openwrt-n11 +++ b/openwrt/openwrt/n11/Dockerfile.openwrt-n11 @@ -18,7 +18,7 @@ RUN make download -j8 RUN sed -i 's/192.168.1.1/10.24.66.1/g' package/base-files/files/bin/config_generate RUN sed -i 's/255.255.255.0/255.0.0.0/g' package/base-files/files/bin/config_generate RUN sed -i "s/hostname='OpenWrt'/hostname='ChinaTelecomOT'/g" package/base-files/files/bin/config_generate -RUN sed -i "s/timezone='UTC'/timezone='Asia\/Shanghai'/g" package/base-files/files/bin/config_generate +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/openwrt/r4s/Dockerfile.openwrt-r4s b/openwrt/openwrt/r4s/Dockerfile.openwrt-r4s index ba8d6e2..3d47a70 100644 --- a/openwrt/openwrt/r4s/Dockerfile.openwrt-r4s +++ b/openwrt/openwrt/r4s/Dockerfile.openwrt-r4s @@ -17,7 +17,7 @@ RUN make download -j8 RUN sed -i 's/192.168.1.1/10.24.4.1/g' package/base-files/files/bin/config_generate RUN sed -i "s/hostname='OpenWrt'/hostname='LicsberR4S'/g" package/base-files/files/bin/config_generate -RUN sed -i "s/timezone='UTC'/timezone='Asia\/Shanghai'/g" package/base-files/files/bin/config_generate +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 -j3 || make V=s; else make -j `nproc` || make V=s; fi && \ diff --git a/openwrt/openwrt/x86/Dockerfile.openwrt-x86 b/openwrt/openwrt/x86/Dockerfile.openwrt-x86 index 1b59381..7780b78 100644 --- a/openwrt/openwrt/x86/Dockerfile.openwrt-x86 +++ b/openwrt/openwrt/x86/Dockerfile.openwrt-x86 @@ -17,7 +17,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/hostname='OpenWrt'/hostname='LicsberOP'/g" package/base-files/files/bin/config_generate -RUN sed -i "s/timezone='UTC'/timezone='Asia\/Shanghai'/g" package/base-files/files/bin/config_generate +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 -j3 || make V=s; else make -j `nproc` || make V=s; fi && \ diff --git a/openwrt/openwrt/x86/openwrt.x86.config b/openwrt/openwrt/x86/openwrt.x86.config index 1251ee8..099b465 100644 --- a/openwrt/openwrt/x86/openwrt.x86.config +++ b/openwrt/openwrt/x86/openwrt.x86.config @@ -5,56 +5,7 @@ CONFIG_TARGET_x86_64_DEVICE_generic=y CONFIG_DEVEL=y CONFIG_CCACHE=y -CONFIG_TARGET_ROOTFS_PARTSIZE=2048 +CONFIG_TARGET_ROOTFS_PARTSIZE=1000 # CONFIG_GRUB_IMAGES is not set CONFIG_GRUB_TITLE="LicsberOpenWRT" - -CONFIG_PACKAGE_luci-app-dockerman=y -CONFIG_PACKAGE_docker-compose=y - -CONFIG_PACKAGE_screen=y -CONFIG_PACKAGE_rsync=y -CONFIG_PACKAGE_fdisk=y -CONFIG_PACKAGE_iperf3=y - -CONFIG_PACKAGE_luci-app-hd-idle=y - -CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=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_python3-pip=y -CONFIG_PACKAGE_python3-requests=y -CONFIG_PACKAGE_python3-speedtest-cli=y - -CONFIG_PACKAGE_golang=y - -CONFIG_PACKAGE_luci-app-netdata=y -CONFIG_PACKAGE_luci-app-openvpn-server=y -CONFIG_PACKAGE_luci-app-serverchan=y - -CONFIG_PACKAGE_vxlan=y -CONFIG_PACKAGE_pppossh=y -CONFIG_PACKAGE_gre=y -CONFIG_PACKAGE_xl2tpd=y - -CONFIG_PACKAGE_luci-app-socat=y - -CONFIG_PACKAGE_luci-app-mwan3=y -CONFIG_PACKAGE_luci-app-mwan3helper=y -CONFIG_PACKAGE_luci-app-syncdial=y