diff --git a/.github/workflows/openwrt-stable-build.yml b/.github/workflows/openwrt-stable-build.yml index 436f3b0..602ed0a 100644 --- a/.github/workflows/openwrt-stable-build.yml +++ b/.github/workflows/openwrt-stable-build.yml @@ -6,7 +6,7 @@ on: - master env: - OPENWRT_VERSION: 23.05.5 + OPENWRT_VERSION: 24.10.0 jobs: build: @@ -27,7 +27,7 @@ jobs: uses: pierotofy/set-swap-space@master with: swap-size-gb: 10 - + - name: Set up QEMU uses: docker/setup-qemu-action@v3 diff --git a/Dockerfile b/Dockerfile index 18ac783..4c18ece 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \ FROM alpine:latest ARG NOVNC_VERSION="1.5.0" -ARG OPENWRT_VERSION="23.05.5" +ARG OPENWRT_VERSION="24.10.0" ARG TARGETPLATFORM ARG OPENWRT_ROOTFS_IMG ARG OPENWRT_KERNEL @@ -102,7 +102,7 @@ RUN echo "Building for platform '$TARGETPLATFORM'" \ VERSION_BUILDINFO=`cat version.buildinfo`; \ OPENWRT_IMAGE="https://downloads.openwrt.org/releases/24.10-SNAPSHOT/targets/armsr/armv8/openwrt-24.10-snapshot-${VERSION_BUILDINFO}-armsr-armv8-generic-squashfs-combined-efi.img.gz"; \ else \ - OPENWRT_IMAGE="https://archive.openwrt.org/releases/${OPENWRT_VERSION}/targets/armsr/armv8/openwrt-${OPENWRT_VERSION}-armsr-armv8-generic-squashfs-combined.img.gz"; \ + OPENWRT_IMAGE="https://archive.openwrt.org/releases/${OPENWRT_VERSION}/targets/armsr/armv8/openwrt-${OPENWRT_VERSION}-armsr-armv8-generic-squashfs-combined-efi.img.gz"; \ fi; \ else \ echo "Error: CPU architecture $TARGETPLATFORM is not supported"; \ diff --git a/docker-compose.yml b/docker-compose.yml index ab00e90..595094f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,14 +2,13 @@ services: openwrt: container_name: openwrt image: albrechtloh/openwrt-docker:latest # for latest OpenWrt stable version - #image: albrechtloh/openwrt-docker:openwrt-2410-snapshot # for latest OpenWrt 24.10 snapshot version #image: albrechtloh/openwrt-docker:openwrt-master-snapshot # for latest OpenWrt master version - #image: openwrt-docker + #mage: openwrt-docker build: context: . dockerfile: Dockerfile args: - OPENWRT_VERSION: "23.05.4" + OPENWRT_VERSION: "24.10.0" #OPENWRT_VERSION: "master" environment: diff --git a/readme.md b/readme.md index b178fe2..2484420 100644 --- a/readme.md +++ b/readme.md @@ -44,8 +44,7 @@ Adapt [`docker-compose.yml`](https://github.com/AlbrechtL/openwrt-docker/blob/ma Images are available at https://hub.docker.com/r/albrechtloh/openwrt-docker. Currently, three images are available. For all of these images automated tests are applied. -* `albrechtloh/openwrt-docker:latest` Latest OpenWrt stable version e.g. 24.05.5 -* `albrechtloh/openwrt-docker:openwrt-2410-snapshot` Latest OpenWrt 24.10 snapshot version +* `albrechtloh/openwrt-docker:latest` Latest OpenWrt stable version e.g. 24.10.0 * `albrechtloh/openwrt-docker:openwrt-master-snapshot` Latest OpenWrt master version ## Support @@ -85,9 +84,9 @@ Clone this repo and run docker build -t openwrt-docker . ``` -If you like to specify a specific OpenWrt version, you can do +If you like to specify a specific OpenWrt version, you can do (minimum version 24.10.0) ```bash -docker build -t openwrt-docker . --build-arg OPENWRT_VERSION="23.05.4" +docker build -t openwrt-docker . --build-arg OPENWRT_VERSION="24.10.0" ``` or for the latest development master. The `--no-cache` option is necessary to get always the newest version. ```bash