fix: correct copy and args

Author: faiq

.goreleaser.yml

@@ -108,8 +108,7 @@ dockers:
       - hack/addons/mindthegap-helm-registry/repos.yaml
     build_flag_templates:
       - "--platform=linux/amd64"
-      - "--pull"
-      - "--builder=caren"
+      - '--build-arg=VERSION=v{{ trimprefix .Version "v" }}'
       - "--label=org.opencontainers.image.created={{.CommitDate}}"
       - "--label=org.opencontainers.image.title=caren-helm-reg"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"
@@ -124,8 +123,7 @@ dockers:
       - hack/addons/mindthegap-helm-registry/repos.yaml
     build_flag_templates:
       - "--platform=linux/arm64"
-      - "--pull"
-      - "--builder=caren"
+      - '--build-arg=VERSION=v{{ trimprefix .Version "v" }}'
       - "--label=org.opencontainers.image.created={{.CommitDate}}"
       - "--label=org.opencontainers.image.title=caren-helm-reg"
       - "--label=org.opencontainers.image.revision={{.FullCommit}}"

hack/addons/mindthegap-helm-registry/Dockerfile

@@ -5,5 +5,5 @@ RUN --mount=source=./hack/addons/mindthegap-helm-registry/repos.yaml,target=/rep
     ["/ko-app/mindthegap", "create", "bundle", "--helm-charts-file=/repos.yaml", "--output-file=/tmp/helm-charts.tar"]
 
 FROM --platform=${TARGETPLATFORM} alpine
-COPY --from=bundle_builder /tmp/helm-charts.tar /charts/
-RUN mv /charts/helm-charts.tar /charts/helm-charts-$(date +%s).tar
+ARG VERSION
+COPY --from=bundle_builder /tmp/helm-charts.tar /charts/helm-charts-${VERSION}.tar

make/goreleaser.mk

@@ -8,12 +8,6 @@ ifndef GORELEASER_CURRENT_TAG
 export GORELEASER_CURRENT_TAG=$(GIT_TAG)
 endif
 
-.PHONY: buildx
-buildx:
-buildx:
-	 docker buildx create --name=caren || true
-	 docker run --privileged --rm tonistiigi/binfmt --install all &>/dev/null || true
-
 .PHONY: build-snapshot
 build-snapshot: ## Builds a snapshot with goreleaser
 build-snapshot: go-generate ; $(info $(M) building snapshot $*)
@@ -27,7 +21,7 @@ build-snapshot: go-generate ; $(info $(M) building snapshot $*)
 
 .PHONY: release
 release: ## Builds a release with goreleaser
-release: buildx go-generate ; $(info $(M) building release $*)
+release: go-generate ; $(info $(M) building release $*)
 	goreleaser --verbose=$(GORELEASER_VERBOSE) \
 		release \
 		--clean \
@@ -37,7 +31,7 @@ release: buildx go-generate ; $(info $(M) building release $*)
 
 .PHONY: release-snapshot
 release-snapshot: ## Builds a snapshot release with goreleaser
-release-snapshot: buildx go-generate ; $(info $(M) building snapshot release $*)
+release-snapshot: go-generate ; $(info $(M) building snapshot release $*)
 	goreleaser --verbose=$(GORELEASER_VERBOSE) \
 		release \
 		--snapshot \