From 6bae2e8a85195026d41bc1d1018b0f6f9d3d9c9d Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Mon, 16 Dec 2024 11:31:11 -0800 Subject: [PATCH 1/2] fix(ci): chainguard build is broken --- deploy/melange.yaml.tmpl | 2 +- kurl_proxy/deploy/melange.yaml.tmpl | 2 +- migrations/deploy/melange.yaml.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/melange.yaml.tmpl b/deploy/melange.yaml.tmpl index 055a7bfddd..385dda7694 100644 --- a/deploy/melange.yaml.tmpl +++ b/deploy/melange.yaml.tmpl @@ -1,6 +1,6 @@ package: name: kotsadm-head - version: ${GIT_TAG} + version: "0.0.1" # our versioning is not compatible with apk epoch: 0 description: Kotsadm package copyright: diff --git a/kurl_proxy/deploy/melange.yaml.tmpl b/kurl_proxy/deploy/melange.yaml.tmpl index 2f84f134e3..cbc1808c79 100644 --- a/kurl_proxy/deploy/melange.yaml.tmpl +++ b/kurl_proxy/deploy/melange.yaml.tmpl @@ -1,6 +1,6 @@ package: name: kurl-proxy-head - version: ${GIT_TAG} + version: "0.0.1" # our versioning is not compatible with apk epoch: 0 description: kurl-proxy package copyright: diff --git a/migrations/deploy/melange.yaml.tmpl b/migrations/deploy/melange.yaml.tmpl index 79b87d40cc..e8ee1ebbbb 100644 --- a/migrations/deploy/melange.yaml.tmpl +++ b/migrations/deploy/melange.yaml.tmpl @@ -1,6 +1,6 @@ package: name: kotsadm-migrations-head - version: ${GIT_TAG} + version: "0.0.1" # our versioning is not compatible with apk epoch: 0 description: kotsadm-migrations package copyright: From 3ec36a1c14d41938da2854a0c0d6f37ce9f1b2ac Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Mon, 16 Dec 2024 12:01:03 -0800 Subject: [PATCH 2/2] fix(ci): chainguard build is broken --- deploy/melange.yaml.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/melange.yaml.tmpl b/deploy/melange.yaml.tmpl index 385dda7694..aef53f9010 100644 --- a/deploy/melange.yaml.tmpl +++ b/deploy/melange.yaml.tmpl @@ -41,8 +41,8 @@ pipeline: mv deploy/assets/postgres "${DESTDIR}/postgres" # kotsadm and kots binaries - export VERSION=${{package.version}} - export GIT_TAG=${{package.version}} + export VERSION=${GIT_TAG} + export GIT_TAG=${GIT_TAG} # Set environment variables from repository source .image.env