Skip to content

Commit

Permalink
fix: use tools instead of base
Browse files Browse the repository at this point in the history
  • Loading branch information
dsseng committed Feb 24, 2025
1 parent 56be872 commit f526941
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion internal/base/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: /
Expand Down

0 comments on commit f526941

Please sign in to comment.