From 017ab6488d9bc29ded2e8d4453b8f729ea2e7511 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sun, 14 Apr 2024 23:32:24 +0200 Subject: [PATCH] Support new zstd compressed archives ImageBuilder and SDK compression switched to zstd due to the recent XZ backdoor event and overall complexity of the XZ design. Signed-off-by: Paul Spooren --- .github/workflows/containers.yml | 4 ++-- Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 645d302..f168bd7 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -214,7 +214,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} build-args: | - DOWNLOAD_FILE=imagebuilder-.*x86_64.tar.xz + DOWNLOAD_FILE=imagebuilder-.*x86_64.tar.[xz|zst] VERSION_PATH=${{ needs.generate_matrix.outputs.version_path }} TARGET=${{ matrix.target }} FILE_HOST=${{ env.FILE_HOST }} @@ -326,7 +326,7 @@ jobs: ${{ steps.meta_target_arch.outputs.tags }} ${{ steps.meta_latest.outputs.tags }} build-args: | - DOWNLOAD_FILE=sdk-.*.Linux-x86_64.tar.xz + DOWNLOAD_FILE=sdk-.*.Linux-x86_64.tar.[xz|zst] VERSION_PATH=${{ needs.generate_matrix.outputs.version_path }} TARGET=${{ matrix.target }} FILE_HOST=${{ env.FILE_HOST }} diff --git a/Dockerfile b/Dockerfile index 0118806..81d7e4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM ghcr.io/openwrt/buildbot/buildworker-v3.11.1:latest WORKDIR /build/ # use "sdk-.*.Linux-x86_64.tar.xz" to create the SDK -ARG DOWNLOAD_FILE="imagebuilder-.*x86_64.tar.xz" +ARG DOWNLOAD_FILE="imagebuilder-.*x86_64.tar.[xz|zst]" ARG TARGET=x86/64 ARG FILE_HOST=downloads.openwrt.org ARG VERSION_PATH