From f52694171d30a9fbe03607150022c7cfcd9cbc9d Mon Sep 17 00:00:00 2001 From: Dmitrii Sharshakov Date: Mon, 24 Feb 2025 21:42:33 +0100 Subject: [PATCH] fix: use tools instead of base --- .kres.yaml | 4 ++++ Makefile | 4 +++- internal/base/pkg.yaml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.kres.yaml b/.kres.yaml index a749b7dd..c623632a 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -70,6 +70,10 @@ spec: defaultValue: v1.10.0-alpha.0-44-g7774b08 - name: PKGS_PREFIX defaultValue: ghcr.io/siderolabs + - name: TOOLS + defaultValue: v1.10.0-alpha.0-17-g6a71711 + - name: TOOLS_PREFIX + defaultValue: ghcr.io/siderolabs useBldrPkgTagResolver: true --- kind: common.Build diff --git a/Makefile b/Makefile index 64d4fed8..2abd3e92 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-02-24T20:02:19Z by kres 1281806. +# Generated on 2025-02-24T20:42:12Z by kres 1281806. # common variables @@ -50,6 +50,8 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG) PKGS ?= v1.10.0-alpha.0-44-g7774b08 PKGS_PREFIX ?= ghcr.io/siderolabs +TOOLS ?= v1.10.0-alpha.0-17-g6a71711 +TOOLS_PREFIX ?= ghcr.io/siderolabs # targets defines all the available targets diff --git a/internal/base/pkg.yaml b/internal/base/pkg.yaml index 4d6b5f61..3e88e12f 100644 --- a/internal/base/pkg.yaml +++ b/internal/base/pkg.yaml @@ -2,7 +2,7 @@ name: base variant: scratch shell: /bin/bash dependencies: - - image: "{{ .BUILD_ARG_PKGS_PREFIX }}/base:{{ .BUILD_ARG_PKGS }}" + - image: "{{ .BUILD_ARG_TOOLS_PREFIX }}/tools:{{ .BUILD_ARG_TOOLS }}" - image: ghcr.io/siderolabs/extensions-validator:7d4395d finalize: - from: /