From 9ef613173ad176e16b657365d20bd71f1a71da5d Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Tue, 12 Jan 2021 09:11:38 +0100
Subject: [PATCH] Apply build args to image

---
 Makefile                  | 9 ++++++++-
 server/bundler.go         | 2 +-
 server/bundler_release.go | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7c03a2704..c39f2de21 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ TAG_NAME := $(shell test -d .git && git describe --abbrev=0 --tags)
 SHA := $(shell test -d .git && git rev-parse --short HEAD)
 VERSION := $(if $(TAG_NAME),$(TAG_NAME),$(SHA))
 BUILD_DATE := $(shell date -u '+%Y-%m-%d_%H:%M:%S')
+BUILD_ARGS := -tags=release -ldflags '-X "github.com/andig/evcc/server.Version=$(VERSION)" -X "github.com/andig/evcc/server.Commit=$(SHA)"'
 
 # docker
 DOCKER_IMAGE := andig/evcc
@@ -49,7 +50,7 @@ assets:
 
 build:
 	@echo Version: $(VERSION) $(BUILD_DATE)
-	go build -v -tags=release -ldflags '-X "github.com/andig/evcc/server.Version=${VERSION}" -X "github.com/andig/evcc/server.Commit=${SHA}"'
+	go build -v $(BUILD_ARGS)
 
 release-test:
 	goreleaser --snapshot --skip-publish --rm-dist
@@ -74,6 +75,8 @@ publish-images:
 
 image:
 	go get github.com/gokrazy/tools/cmd/gokr-packer
+	mkdir -p buildargs/github.com/andig/evcc
+	echo "$(BUILD_ARGS)" > buildargs/github.com/andig/evcc/buildargs.txt
 	gokr-packer -overwrite=$(IMAGE_FILE) -target_storage_bytes=1258299392 $(IMAGE_OPTIONS)
 
 	# create filesystem
@@ -81,8 +84,12 @@ image:
 	gzip -f -k $(IMAGE_FILE)
 
 image-rootfs:
+	mkdir -p buildargs/github.com/andig/evcc
+	echo "$(BUILD_ARGS)" > buildargs/github.com/andig/evcc/buildargs.txt
 	gokr-packer -overwrite_root=$(IMAGE_ROOTFS) $(IMAGE_OPTIONS)
 	gzip -f -k $(IMAGE_ROOTFS)
 
 image-update:
+	mkdir -p buildargs/github.com/andig/evcc
+	echo "$(BUILD_ARGS)" > buildargs/github.com/andig/evcc/buildargs.txt
 	gokr-packer -update yes $(IMAGE_OPTIONS)
diff --git a/server/bundler.go b/server/bundler.go
index a0a36a44d..c16f66dfd 100644
--- a/server/bundler.go
+++ b/server/bundler.go
@@ -1,4 +1,4 @@
-// +build !release,!gokrazy
+// +build !release
 
 package server
 
diff --git a/server/bundler_release.go b/server/bundler_release.go
index 5feb730c2..954f751f4 100644
--- a/server/bundler_release.go
+++ b/server/bundler_release.go
@@ -1,4 +1,4 @@
-// +build release gokrazy
+// +build release
 
 package server