Skip to content
This repository was archived by the owner on Apr 11, 2025. It is now read-only.

Commit 4102a78

Browse files
committed
feat: build hermetically using new bldr and pkgs
Update bldr manually, fix builds with new base and use network only when needed (and verified by Go itself). Signed-off-by: Dmitry Sharshakov <[email protected]>
1 parent f4a110f commit 4102a78

File tree

12 files changed

+13
-57
lines changed

12 files changed

+13
-57
lines changed

.kres.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
kind: pkgfile.Build
33
spec:
44
targets:
5-
- install-cni
6-
- talosctl-cni-bundle-install
7-
reproducibleTargetName: reproducibility
5+
- talosctl-cni-bundle
6+
reproducibleTargetName: talosctl-cni-bundle

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-01-21T11:42:07Z by kres 3075de9.
3+
# Generated on 2025-02-06T12:31:14Z by kres 987bf4d.
44

55
# common variables
66

@@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
2525

2626
# sync bldr image with pkgfile
2727

28-
BLDR_RELEASE := v0.3.2
28+
BLDR_RELEASE := v0.4.0-1-g76a2c8f
2929
BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
3030
BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src
3131

@@ -44,8 +44,7 @@ COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
4444

4545
# targets defines all the available targets
4646

47-
TARGETS = install-cni
48-
TARGETS += talosctl-cni-bundle-install
47+
TARGETS = talosctl-cni-bundle
4948

5049
# help menu
5150

@@ -116,7 +115,7 @@ docker-%: ## Builds the specified target defined in the Pkgfile using the docke
116115
@$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)"
117116

118117
reproducibility-test: ## Builds the reproducibility test target
119-
@$(MAKE) reproducibility-test-local-reproducibility
118+
@$(MAKE) reproducibility-test-local-talosctl-cni-bundle
120119

121120
reproducibility-test-local-%: ## Builds the specified target defined in the Pkgfile using the local output type with and without cahce. The build result will be output to the specified local destination
122121
@rm -rf $(ARTIFACTS)/build-a $(ARTIFACTS)/build-b

Pkgfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# syntax = ghcr.io/siderolabs/bldr:v0.3.2
1+
# syntax = ghcr.io/siderolabs/bldr:v0.4.0-1-g76a2c8f
22

33
format: v1alpha2
44

55
vars:
66
PKGS_PREFIX: ghcr.io/siderolabs
7-
PKGS_VERSION: v1.10.0-alpha.0-32-g38749d1
7+
PKGS_VERSION: v1.10.0-alpha.0-35-g85f8901
88

99
# renovate: datasource=git-refs versioning=git depName=https://github.com/awslabs/tc-redirect-tap.git
1010
tc_redirect_tap_ref: fb2c2b5e660adb567157c9d69e1de19b0c7c4f37

base/pkg.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: base
22
variant: scratch
3-
shell: /toolchain/bin/bash
43
dependencies:
54
- image: "{{ .PKGS_PREFIX }}/base:{{ .PKGS_VERSION }}"
65
- image: "{{ .PKGS_PREFIX }}/ca-certificates:{{ .PKGS_VERSION }}"

deps.png

-38.8 KB
Loading

install-cni/pkg.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

install-cni/scripts/install-cni.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

reproducibility/pkg.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

talosctl-cni-bundle-install/pkg.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

talosctl-cni-bundle-install/scripts/install-cni.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)