Skip to content

Commit 0db3e48

Browse files
committed
Bump to OpenWrt 25.12.0. Remove deprecated opkg from Dockerfile
1 parent 5181666 commit 0db3e48

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

.github/workflows/openwrt-stable-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77

88
env:
9-
OPENWRT_VERSION: 24.10.5
9+
OPENWRT_VERSION: 25.12.0
1010

1111
jobs:
1212
build:

Dockerfile

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN npm run build -- "--base-href='./'"
5151
########################################################################################################################
5252
FROM alpine:latest
5353

54-
ARG OPENWRT_VERSION="24.10.5"
54+
ARG OPENWRT_VERSION="25.12.0"
5555
ARG TARGETPLATFORM
5656
ARG OPENWRT_ROOTFS_IMG
5757
ARG OPENWRT_KERNEL
@@ -167,18 +167,11 @@ RUN echo "Building for platform '$TARGETPLATFORM'" \
167167
fi \
168168
&& echo "QEMU started with PID $QEMU_PID" \
169169
\
170-
# OpenWrt master uses apk insted of opkg \
171-
&& if [ "$OPENWRT_VERSION" = "master" ]; then \
172-
PACKAGE_UPDATE="apk update"; \
173-
PACKAGE_INSTALL="apk add"; \
174-
PACKAGE_REMOVE="apk del"; \
175-
PACKAGE_EXTRA="libudev-zero"; \
176-
else \
177-
PACKAGE_UPDATE="opkg update"; \
178-
PACKAGE_INSTALL="opkg install"; \
179-
PACKAGE_REMOVE="opkg remove"; \
180-
PACKAGE_EXTRA=""; \
181-
fi \
170+
# OpenWrt uses apk now \
171+
&& PACKAGE_UPDATE="apk update" \
172+
&& PACKAGE_INSTALL="apk add" \
173+
&& PACKAGE_REMOVE="apk del" \
174+
&& PACKAGE_EXTRA="libudev-zero" \
182175
\
183176
# Wait for OpenWrt startup and update repo \
184177
&& until ssh -o ConnectTimeout=10 -o StrictHostKeyChecking=accept-new root@localhost -p $SSH_PORT "cat /etc/banner"; do echo "Waiting for OpenWrt boot ..."; sleep 1; done \

0 commit comments

Comments
 (0)