mirror of https://github.com/openwrt/docker.git
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 <mail@aparcar.org>pull/138/head
parent
eba0c3a321
commit
017ab6488d
|
|
@ -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 }}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue