From 0273100f77efb8263cbffa8dfa6491b7edadd7dc Mon Sep 17 00:00:00 2001 From: Anthony ARNAUD Date: Wed, 17 Jan 2024 16:44:28 -0500 Subject: [PATCH] fix: allow to use custom PKGS_PREFIX use custom pkgs repository by setting PKGS_PREFIX as argument Signed-off-by: Anthony ARNAUD Signed-off-by: Noel Georgi --- .kres.yaml | 3 +++ Makefile | 4 +++- Pkgfile | 1 - drivers/chelsio/pkg.yaml | 2 +- drivers/gasket/pkg.yaml | 2 +- drivers/mellanox-ofed/pkg.yaml | 2 +- drivers/thunderbolt/pkg.yaml | 2 +- drivers/usb-modem/pkg.yaml | 2 +- drivers/v4l-uvc/pkg.yaml | 2 +- firmware/amd-ucode/pkg.yaml | 2 +- firmware/amdgpu-firmware/pkg.yaml | 2 +- firmware/bnx2-bnx2x/pkg.yaml | 2 +- firmware/chelsio/pkg.yaml | 2 +- firmware/i915-ucode/pkg.yaml | 2 +- firmware/intel-ice-firmware/pkg.yaml | 2 +- firmware/qlogic-firmware/pkg.yaml | 2 +- guest-agents/qemu-guest-agent/glib/pkg.yaml | 2 +- guest-agents/qemu-guest-agent/pkg.yaml | 2 +- internal/base/pkg.yaml | 4 ++-- misc/binfmt-misc/pkg.yaml | 2 +- nvidia-gpu/nonfree/kmod-nvidia/pkg.yaml | 2 +- nvidia-gpu/nvidia-modules/pkg.yaml | 2 +- power/nut-client/pkg.yaml | 4 ++-- storage/btrfs/pkg.yaml | 2 +- storage/drbd/pkg.yaml | 2 +- storage/fuse3/pkg.yaml | 2 +- storage/iscsi-tools/open-iscsi/pkg.yaml | 6 +++--- storage/iscsi-tools/open-isns/pkg.yaml | 2 +- storage/mdadm/pkg.yaml | 4 ++-- storage/zfs/pkg.yaml | 2 +- 30 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.kres.yaml b/.kres.yaml index 0a7318f1..15293d05 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -41,6 +41,7 @@ spec: extraBuildArgs: - TAG - PKGS + - PKGS_PREFIX useBldrPkgTagResolver: true --- kind: common.Build @@ -78,6 +79,8 @@ spec: defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG) - name: PKGS defaultValue: v1.7.0-alpha.0-13-gf376a53 + - name: PKGS_PREFIX + defaultValue: ghcr.io/siderolabs depends: - internal/extensions/descriptions.yaml script: diff --git a/Makefile b/Makefile index 8001c8ba..bf709628 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-01-17T14:50:07Z by kres latest. +# Generated on 2024-01-22T17:59:56Z by kres latest. # common variables @@ -46,6 +46,7 @@ COMMON_ARGS += --platform=$(PLATFORM) COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) COMMON_ARGS += --build-arg=TAG="$(TAG)" COMMON_ARGS += --build-arg=PKGS="$(PKGS)" +COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" # targets defines all the available targets @@ -87,6 +88,7 @@ NONFREE_TARGETS = nonfree-kmod-nvidia EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) PKGS ?= v1.7.0-alpha.0-13-gf376a53 +PKGS_PREFIX ?= ghcr.io/siderolabs # help menu diff --git a/Pkgfile b/Pkgfile index f32cab41..f857738a 100644 --- a/Pkgfile +++ b/Pkgfile @@ -3,7 +3,6 @@ format: v1alpha2 vars: - PKGS_PREFIX: ghcr.io/siderolabs LINUX_FIRMWARE_VERSION: "20240115" # update this when updating PKGS_VERSION in Makefile DRBD_DRIVER_VERSION: 9.2.7 # update this when updating PKGS_VERSION in Makefile ZFS_DRIVER_VERSION: 2.2.2 # update this when updating PKGS_VERSION in Makefile diff --git a/drivers/chelsio/pkg.yaml b/drivers/chelsio/pkg.yaml index 894541bf..981ccfd4 100644 --- a/drivers/chelsio/pkg.yaml +++ b/drivers/chelsio/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/drivers/gasket/pkg.yaml b/drivers/gasket/pkg.yaml index 07b6af87..0c7bae47 100644 --- a/drivers/gasket/pkg.yaml +++ b/drivers/gasket/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/gasket-driver-pkg:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/gasket-driver-pkg:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/drivers/mellanox-ofed/pkg.yaml b/drivers/mellanox-ofed/pkg.yaml index 5a6f2e2b..cfe0069b 100644 --- a/drivers/mellanox-ofed/pkg.yaml +++ b/drivers/mellanox-ofed/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/mellanox-ofed-pkg:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/mellanox-ofed-pkg:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/drivers/thunderbolt/pkg.yaml b/drivers/thunderbolt/pkg.yaml index fb50f8db..0a01fac1 100644 --- a/drivers/thunderbolt/pkg.yaml +++ b/drivers/thunderbolt/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/drivers/usb-modem/pkg.yaml b/drivers/usb-modem/pkg.yaml index 91043fec..700342bc 100644 --- a/drivers/usb-modem/pkg.yaml +++ b/drivers/usb-modem/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/drivers/v4l-uvc/pkg.yaml b/drivers/v4l-uvc/pkg.yaml index 0263ef00..089d8c97 100644 --- a/drivers/v4l-uvc/pkg.yaml +++ b/drivers/v4l-uvc/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/amd-ucode/pkg.yaml b/firmware/amd-ucode/pkg.yaml index e998471c..26d1c9c7 100644 --- a/firmware/amd-ucode/pkg.yaml +++ b/firmware/amd-ucode/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/amdgpu-firmware/pkg.yaml b/firmware/amdgpu-firmware/pkg.yaml index 5acc6302..5be9d33d 100644 --- a/firmware/amdgpu-firmware/pkg.yaml +++ b/firmware/amdgpu-firmware/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/bnx2-bnx2x/pkg.yaml b/firmware/bnx2-bnx2x/pkg.yaml index d1e3c20b..c300435a 100644 --- a/firmware/bnx2-bnx2x/pkg.yaml +++ b/firmware/bnx2-bnx2x/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/chelsio/pkg.yaml b/firmware/chelsio/pkg.yaml index 83f5c369..f17caa2b 100644 --- a/firmware/chelsio/pkg.yaml +++ b/firmware/chelsio/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/i915-ucode/pkg.yaml b/firmware/i915-ucode/pkg.yaml index 17d9de2f..b97feca9 100644 --- a/firmware/i915-ucode/pkg.yaml +++ b/firmware/i915-ucode/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/intel-ice-firmware/pkg.yaml b/firmware/intel-ice-firmware/pkg.yaml index 09260229..c7c9dd58 100644 --- a/firmware/intel-ice-firmware/pkg.yaml +++ b/firmware/intel-ice-firmware/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/firmware/qlogic-firmware/pkg.yaml b/firmware/qlogic-firmware/pkg.yaml index 5da8551c..f558793f 100644 --- a/firmware/qlogic-firmware/pkg.yaml +++ b/firmware/qlogic-firmware/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/linux-firmware:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/guest-agents/qemu-guest-agent/glib/pkg.yaml b/guest-agents/qemu-guest-agent/glib/pkg.yaml index f4dedbe9..44210831 100644 --- a/guest-agents/qemu-guest-agent/glib/pkg.yaml +++ b/guest-agents/qemu-guest-agent/glib/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" - stage: pcre2 steps: - sources: diff --git a/guest-agents/qemu-guest-agent/pkg.yaml b/guest-agents/qemu-guest-agent/pkg.yaml index 6ab2695a..68cb124c 100644 --- a/guest-agents/qemu-guest-agent/pkg.yaml +++ b/guest-agents/qemu-guest-agent/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" - stage: pcre2 - stage: glib steps: diff --git a/internal/base/pkg.yaml b/internal/base/pkg.yaml index 4004f2e3..33960617 100644 --- a/internal/base/pkg.yaml +++ b/internal/base/pkg.yaml @@ -2,8 +2,8 @@ name: base variant: scratch shell: /toolchain/bin/bash dependencies: - - image: "{{ .PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS }}" - - image: "{{ .PKGS_PREFIX }}/ca-certificates:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/ca-certificates:{{ .BUILD_ARG_PKGS }}" finalize: - from: / to: / diff --git a/misc/binfmt-misc/pkg.yaml b/misc/binfmt-misc/pkg.yaml index a2f78e54..101d24e7 100644 --- a/misc/binfmt-misc/pkg.yaml +++ b/misc/binfmt-misc/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/nvidia-gpu/nonfree/kmod-nvidia/pkg.yaml b/nvidia-gpu/nonfree/kmod-nvidia/pkg.yaml index 236a7ab4..c0df214c 100644 --- a/nvidia-gpu/nonfree/kmod-nvidia/pkg.yaml +++ b/nvidia-gpu/nonfree/kmod-nvidia/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/nonfree-kmod-nvidia-pkg:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/nonfree-kmod-nvidia-pkg:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/nvidia-gpu/nvidia-modules/pkg.yaml b/nvidia-gpu/nvidia-modules/pkg.yaml index 6a74598e..a7043af7 100644 --- a/nvidia-gpu/nvidia-modules/pkg.yaml +++ b/nvidia-gpu/nvidia-modules/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/nvidia-open-gpu-kernel-modules-pkg:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/nvidia-open-gpu-kernel-modules-pkg:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/power/nut-client/pkg.yaml b/power/nut-client/pkg.yaml index dfe57ecd..fd0487d5 100644 --- a/power/nut-client/pkg.yaml +++ b/power/nut-client/pkg.yaml @@ -3,8 +3,8 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" - - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}" steps: - sources: - url: https://github.com/networkupstools/nut/releases/download/v{{ .NUT_VERSION }}/nut-{{ .NUT_VERSION }}.tar.gz diff --git a/storage/btrfs/pkg.yaml b/storage/btrfs/pkg.yaml index 5bc3e73b..5382a2c4 100644 --- a/storage/btrfs/pkg.yaml +++ b/storage/btrfs/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kernel:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/storage/drbd/pkg.yaml b/storage/drbd/pkg.yaml index 5ae4492f..894facb9 100644 --- a/storage/drbd/pkg.yaml +++ b/storage/drbd/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/drbd-pkg:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/drbd-pkg:{{ .BUILD_ARG_PKGS }}" steps: - prepare: - | diff --git a/storage/fuse3/pkg.yaml b/storage/fuse3/pkg.yaml index 2ac9d5df..569f1405 100644 --- a/storage/fuse3/pkg.yaml +++ b/storage/fuse3/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" steps: - sources: - url: https://github.com/libfuse/libfuse/releases/download/fuse-{{ .FUSE3_VERSION }}/fuse-{{ .FUSE3_VERSION }}.tar.gz diff --git a/storage/iscsi-tools/open-iscsi/pkg.yaml b/storage/iscsi-tools/open-iscsi/pkg.yaml index 61d47ba8..9ad0cad7 100644 --- a/storage/iscsi-tools/open-iscsi/pkg.yaml +++ b/storage/iscsi-tools/open-iscsi/pkg.yaml @@ -3,9 +3,9 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/kmod:{{ .BUILD_ARG_PKGS }}" - - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" - - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/kmod:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}" - stage: open-isns from: /rootfs steps: diff --git a/storage/iscsi-tools/open-isns/pkg.yaml b/storage/iscsi-tools/open-isns/pkg.yaml index 20f73456..e0484143 100644 --- a/storage/iscsi-tools/open-isns/pkg.yaml +++ b/storage/iscsi-tools/open-isns/pkg.yaml @@ -3,7 +3,7 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/openssl:{{ .BUILD_ARG_PKGS }}" steps: - sources: - url: https://github.com/open-iscsi/open-isns/archive/refs/tags/v{{ .OPEN_ISNS_VERSION }}.tar.gz diff --git a/storage/mdadm/pkg.yaml b/storage/mdadm/pkg.yaml index 3d67420b..b8f8a80a 100644 --- a/storage/mdadm/pkg.yaml +++ b/storage/mdadm/pkg.yaml @@ -3,8 +3,8 @@ variant: scratch shell: /toolchain/bin/bash dependencies: - stage: base - - image: "{{ .PKGS_PREFIX }}/eudev:{{ .BUILD_ARG_PKGS }}" - - image: "{{ .PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/eudev:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/util-linux:{{ .BUILD_ARG_PKGS }}" steps: - sources: - url: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-{{ .MDADM_VERSION }}.tar.gz diff --git a/storage/zfs/pkg.yaml b/storage/zfs/pkg.yaml index bc311a81..1d5e1f96 100644 --- a/storage/zfs/pkg.yaml +++ b/storage/zfs/pkg.yaml @@ -5,7 +5,7 @@ dependencies: - stage: base # The pkgs version for a particular release of Talos as defined in # https://github.com/siderolabs/talos/blob//pkg/machinery/gendata/data/pkgs - - image: "{{ .PKGS_PREFIX }}/zfs-pkg:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/zfs-pkg:{{ .BUILD_ARG_PKGS }}" - stage: libtirpc-zfs - stage: zlib-zfs - stage: zfs-tools