Add Openwrt master option

This commit is contained in:
Albrecht Lohofener
2024-02-17 20:31:16 +01:00
parent 50faa5828e
commit 1c19f5fe36
2 changed files with 16 additions and 5 deletions
+14 -5
View File
@@ -19,13 +19,21 @@ RUN apk add --no-cache \
&& mv app core vendor package.json *.html /usr/share/novnc \
&& sed -i 's/^worker_processes.*/worker_processes 1;/' /etc/nginx/nginx.conf
# export OPENWRT_VERSION=`date '+%Y%M%W'`_$OPENWRT_VERSION \
# Get OpenWrt images
RUN mkdir /var/vm \
&& wget "https://archive.openwrt.org/releases/${OPENWRT_VERSION}/targets/armsr/armv8/openwrt-${OPENWRT_VERSION}-armsr-armv8-generic-ext4-rootfs.img.gz" \
-O /var/vm/rootfs-${OPENWRT_VERSION}.img.gz \
&& wget "https://archive.openwrt.org/releases/${OPENWRT_VERSION}/targets/armsr/armv8/openwrt-${OPENWRT_VERSION}-armsr-armv8-generic-kernel.bin" \
-O /var/vm/kernel.bin
RUN mkdir /var/vm \
&& if [ "$OPENWRT_VERSION" = "master" ] ; then \
wget "https://downloads.openwrt.org/snapshots/targets/armsr/armv8/openwrt-armsr-armv8-generic-ext4-rootfs.img.gz" \
-O /var/vm/rootfs-${OPENWRT_VERSION}.img.gz \
&& wget "https://downloads.openwrt.org/snapshots/targets/armsr/armv8/openwrt-armsr-armv8-generic-kernel.bin" \
-O /var/vm/kernel.bin ;\
else \
wget "https://archive.openwrt.org/releases/${OPENWRT_VERSION}/targets/armsr/armv8/openwrt-${OPENWRT_VERSION}-armsr-armv8-generic-ext4-rootfs.img.gz" \
-O /var/vm/rootfs-${OPENWRT_VERSION}.img.gz \
&& wget "https://archive.openwrt.org/releases/${OPENWRT_VERSION}/targets/armsr/armv8/openwrt-${OPENWRT_VERSION}-armsr-armv8-generic-kernel.bin" \
-O /var/vm/kernel.bin ;\
fi
ENV OPENWRT_VERSION=${OPENWRT_VERSION}
COPY ./src /run/
@@ -37,6 +45,7 @@ RUN chmod +x /run/*.sh
VOLUME /storage
EXPOSE 8006
EXPOSE 8000
EXPOSE 8022
RUN echo "$VERSION_ARG" > /run/version
+2
View File
@@ -139,6 +139,7 @@ if [ -f /storage/old_version ]; then
chmod +x /mnt/etc/rc.local
umount /mnt
info "Boot previos $OLD_VERSION_ROOTFS to get config"
qemu-system-aarch64 -M virt \
-m 128 \
-nodefaults \
@@ -173,6 +174,7 @@ if [ -f /storage/old_version ]; then
chmod +x /mnt/etc/rc.local
umount /mnt
info "Boot current rootfs-${OPENWRT_VERSION}.img to install config"
qemu-system-aarch64 -M virt \
-m 128 \
-nodefaults \