From 650555d965b6c1755bd81b052eb0b65afe0e9b2c Mon Sep 17 00:00:00 2001
From: Rakshit Gondwal <rakshit.gondwal@chainguard.dev>
Date: Wed, 19 Mar 2025 21:46:07 +0530
Subject: [PATCH 1/2] refactor melange to use go/build
Signed-off-by: Rakshit Gondwal <rakshit.gondwal@chainguard.dev>
---
melange.yaml | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/melange.yaml b/melange.yaml
index 742f1e16009..51358097b4a 100644
--- a/melange.yaml
+++ b/melange.yaml
@@ -29,12 +29,17 @@ pipeline:
deps: |-
github.com/containerd/containerd/v2@v2.0.4
- - runs: |
- make melange
- install -m755 -D ./melange "${{targets.contextdir}}"/usr/bin/melange
-
- - uses: strip
-
+ - uses: go/build
+ with:
+ output: melange
+ packages: .
+ ldflags: |
+ -buildid= \
+ -X sigs.k8s.io/release-utils/version.gitVersion=$(git describe --dirty --tags --always) \
+ -X sigs.k8s.io/release-utils/version.gitCommit=$(git rev-parse HEAD) \
+ -X sigs.k8s.io/release-utils/version.gitTreeState=$(shell git diff --quiet >/dev/null 2>&1 || echo "dirty" || echo "clean") \
+ -X sigs.k8s.io/release-utils/version.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+
subpackages:
- name: melange-microvm-init
description: Minimal busybox init for microvm workloads
From 8f2976e96249370f75aca8616835333bcbd0c971 Mon Sep 17 00:00:00 2001
From: Rakshit Gondwal <rakshit.gondwal@chainguard.dev>
Date: Wed, 19 Mar 2025 21:54:02 +0530
Subject: [PATCH 2/2] bump epoch
Signed-off-by: Rakshit Gondwal <rakshit.gondwal@chainguard.dev>
---
melange.yaml | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/melange.yaml b/melange.yaml
index 51358097b4a..50c4953b86b 100644
--- a/melange.yaml
+++ b/melange.yaml
@@ -1,7 +1,7 @@
package:
name: melange
version: "0.23.0"
- epoch: 1
+ epoch: 2
description: build APKs from source code
copyright:
- license: Apache-2.0
@@ -10,13 +10,6 @@ package:
- bubblewrap
- ca-certificates-bundle
-environment:
- contents:
- packages:
- - busybox
- - ca-certificates-bundle
- - go
-
pipeline:
- uses: git-checkout
with:
@@ -39,7 +32,7 @@ pipeline:
-X sigs.k8s.io/release-utils/version.gitCommit=$(git rev-parse HEAD) \
-X sigs.k8s.io/release-utils/version.gitTreeState=$(shell git diff --quiet >/dev/null 2>&1 || echo "dirty" || echo "clean") \
-X sigs.k8s.io/release-utils/version.buildDate=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-
+
subpackages:
- name: melange-microvm-init
description: Minimal busybox init for microvm workloads