Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
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 2026-03-06T12:48:55Z by kres 1dd7316.
# Generated on 2026-03-18T16:47:13Z by kres 3675077.

concurrency:
group: ${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
with:
append: |
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
Expand All @@ -80,7 +80,7 @@ jobs:
make nonfree
- name: Login to registry
if: github.event_name != 'pull_request'
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # version: v3.7.0
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # version: v4.0.0
with:
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
Expand Down Expand Up @@ -171,7 +171,7 @@ jobs:
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
with:
driver: remote
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
with:
append: |
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/grype-scan-cron.yaml
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 2026-03-06T12:48:55Z by kres 1dd7316.
# Generated on 2026-03-18T16:47:13Z by kres 3675077.

concurrency:
group: ${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
with:
driver: remote
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/weekly.yaml
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 2026-03-06T12:48:55Z by kres 1dd7316.
# Generated on 2026-03-18T16:47:13Z by kres 3675077.

concurrency:
group: ${{ github.head_ref || github.run_id }}
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
git fetch --prune --unshallow
- name: Set up Docker Buildx
id: setup-buildx
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
with:
append: |
- endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
Expand Down
15 changes: 7 additions & 8 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ spec:
- name: EXTENSIONS_IMAGE_REF
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
- name: PKGS
defaultValue: v1.12.0-46-ge695c74
defaultValue: v1.12.0-50-ga92bed5
- name: PKGS_PREFIX
defaultValue: ghcr.io/siderolabs
- name: TOOLS
Expand Down Expand Up @@ -184,12 +184,10 @@ spec:
enabled: true
phony: true
depends:
- $(ARTIFACTS)/bldr
- internal/extensions/image-digests
script:
- |
@rm -f _out/extensions-metadata
@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/extensions-metadata;)
@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/extensions-metadata;)
@cp internal/extensions/image-digests $(ARTIFACTS)/extensions-metadata
---
kind: custom.Step
name: internal/extensions/image-digests
Expand All @@ -198,11 +196,12 @@ spec:
enabled: true
phony: true
depends:
- extensions-metadata
- $(ARTIFACTS)/bldr
script:
- |
@echo "Generating image digests..."
@cat _out/extensions-metadata | xargs -I{} sh -c 'echo {}@$$(crane digest {})' > internal/extensions/image-digests
@rm -f internal/extensions/image-digests
@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
---
kind: custom.Step
name: internal/extensions/descriptions.yaml
Expand Down
19 changes: 9 additions & 10 deletions 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 2026-03-06T12:48:55Z by kres 1dd7316.
# Generated on 2026-03-17T18:42:59Z by kres 3675077.

# common variables

Expand Down Expand Up @@ -53,7 +53,7 @@ COMMON_ARGS += $(BUILD_ARGS)
# extra variables

EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
PKGS ?= v1.12.0-46-ge695c74
PKGS ?= v1.12.0-50-ga92bed5
PKGS_PREFIX ?= ghcr.io/siderolabs
TOOLS ?= v1.12.0-7-g57916cb
TOOLS_PREFIX ?= ghcr.io/siderolabs
Expand Down Expand Up @@ -235,7 +235,7 @@ nonfree: $(NONFREE_TARGETS) ## Builds all nonfree targets defined.

.PHONY: $(TARGETS) $(NONFREE_TARGETS)
$(TARGETS) $(NONFREE_TARGETS): $(ARTIFACTS)/bldr
@$(MAKE) docker-$@ TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/$@:$(shell $(ARTIFACTS)/bldr eval --target $@ --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) --push=$(PUSH)"
@$(MAKE) docker-$@ TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/$@:$(shell $(ARTIFACTS)/bldr eval --target $@ --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) --push=$(PUSH) --metadata-file=$(ARTIFACTS)/$@.metadata.json"

.PHONY: deps.svg
deps.svg: ## Generates a dependency graph of the Pkgfile.
Expand All @@ -256,15 +256,14 @@ check-dirty:
@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi

.PHONY: extensions-metadata
extensions-metadata: $(ARTIFACTS)/bldr
@rm -f _out/extensions-metadata
@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/extensions-metadata;)
@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null) >> _out/extensions-metadata;)
extensions-metadata: internal/extensions/image-digests
@cp internal/extensions/image-digests $(ARTIFACTS)/extensions-metadata

.PHONY: internal/extensions/image-digests
internal/extensions/image-digests: extensions-metadata
@echo "Generating image digests..."
@cat _out/extensions-metadata | xargs -I{} sh -c 'echo {}@$$(crane digest {})' > internal/extensions/image-digests
internal/extensions/image-digests: $(ARTIFACTS)/bldr
@rm -f internal/extensions/image-digests
@$(foreach target,$(TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)
@$(foreach target,$(NONFREE_TARGETS),echo $(REGISTRY)/$(USERNAME)/$(target):$(shell $(ARTIFACTS)/bldr eval --target $(target) --build-arg TAG=$(TAG) '{{.VERSION}}' 2>/dev/null)@$(shell yq -r '."containerimage.digest"' $(ARTIFACTS)/$(target).metadata.json) >> internal/extensions/image-digests;)

.PHONY: internal/extensions/descriptions.yaml
internal/extensions/descriptions.yaml: internal/extensions/image-digests
Expand Down
8 changes: 4 additions & 4 deletions Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ format: v1alpha2

vars:
CONTAINERD_VERSION: v2.1.6 # update this when updating PKGS_VERSION in Makefile
LINUX_FIRMWARE_VERSION: "20260221" # update this when updating PKGS_VERSION in Makefile
LINUX_FIRMWARE_VERSION: "20260309" # update this when updating PKGS_VERSION in Makefile
DRBD_DRIVER_VERSION: 9.2.16 # update this when updating PKGS_VERSION in Makefile
ZFS_DRIVER_VERSION: 2.4.0 # update this when updating PKGS_VERSION in Makefile
ZFS_TOOLS_SHA256: 7bdf13de0a71d95554c0e3e47d5e8f50786c30d4f4b63b7c593b1d11af75c9ee
ZFS_TOOLS_SHA512: 5f4460707cc24c55900a08d106e549ecc9eb42bc7b64e0fb613d85ba2054c3bc834fb10c34822ef14406dfcfc07b38b7ca668a02086eecb0f107d2ffce66a998
ZFS_DRIVER_VERSION: 2.4.1 # update this when updating PKGS_VERSION in Makefile
ZFS_TOOLS_SHA256: c17b69770f0023154f578eb8c7536a70f07d6a3bb0bd38f04fa0e8811c3c1390
ZFS_TOOLS_SHA512: 15ef20ed8fb976dd123e1f5dca8f0f71a754a3be6edf826bf1d744a28cc8400969d33b79be90a4b5bef95dd200caaca942876f4462b7749667a9e4a225d82676
UTIL_LINUX_VERSION: 2.41.2 # update this when updating TOOLS in Makefile
UTIL_LINUX_SHA256: 6062a1d89b571a61932e6fc0211f36060c4183568b81ee866cf363bce9f6583e
UTIL_LINUX_SHA512: 696c87e7cf185acc9b4b969ddade6155ea2945ae494eaecfd7b1f35d9607166cb09be79878fb793dd31b4d4dcac8c9be4be76af3886185db7ae8b58c303fb0cf
Expand Down
Loading