From 05c76ceaad05f49ef4a1e0780449d0bacec8351c Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Mon, 17 Oct 2022 18:53:15 +0200
Subject: [PATCH] chore: reduce build context

---
 .dockerignore | 4 ++++
 .gitignore    | 4 ++--
 Makefile      | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 52abfd4d1..12a0e4b43 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,10 +3,14 @@
 .vscode
 *.conf
 *.Dockerfile
+*.image
 *.json
 *.sh
 *.yaml
 Dockerfile
+evcc
+evcc.exe
+builddir
 node_modules
 release
 !entrypoint.sh
diff --git a/.gitignore b/.gitignore
index 0ca529302..0978e8e29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,9 +14,9 @@ __debug_bin
 evcc
 evcc.exe
 evcc_*
-flags/*
-buildflags/*
 linux-*.Dockerfile
+builddir
+flags
 node_modules
 release
 *.inc
diff --git a/Makefile b/Makefile
index 9690d862f..16ed50fc5 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ PLATFORM := linux/amd64,linux/arm64,linux/arm/v6
 # gokrazy image
 IMAGE_FILE := evcc_$(TAG_NAME).image
 IMAGE_ROOTFS := evcc_$(TAG_NAME).rootfs
-IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybox github.com/gokrazy/breakglass github.com/evcc-io/evcc
+IMAGE_OPTIONS := -hostname evcc -http_port 8080 github.com/gokrazy/serial-busybox github.com/gokrazy/breakglass github.com/gokrazy/wifi github.com/evcc-io/evcc
 
 # deb
 PACKAGES = ./release
@@ -106,16 +106,16 @@ apt-release::
 
 # gokrazy image
 prepare-image::
-	go install github.com/gokrazy/tools/cmd/gokr-packer@latest
+	go install github.com/gokrazy/tools/cmd/gokr-packer@main
 	mkdir -p flags/github.com/gokrazy/breakglass
 	echo "-forward=private-network" > flags/github.com/gokrazy/breakglass/flags.txt
 	mkdir -p buildflags/github.com/evcc-io/evcc
 	echo "$(BUILD_TAGS),gokrazy" > buildflags/github.com/evcc-io/evcc/buildflags.txt
-	echo "$(BUILD_ARGS)" >> buildflags/github.com/evcc-io/evcc/buildflags.txt
+	echo "-ldflags=$(LD_FLAGS)" >> buildflags/github.com/evcc-io/evcc/buildflags.txt
 
 image::
 	gokr-packer -overwrite=$(IMAGE_FILE) -target_storage_bytes=1258299392 $(IMAGE_OPTIONS)
-	loop=$$(sudo losetup --find --show -P $(IMAGE_FILE)); sudo mkfs.ext4 $${loop}p4
+	loop=$$(losetup --find --show -P $(IMAGE_FILE)); mkfs.ext4 $${loop}p4
 	gzip -f $(IMAGE_FILE)
 
 image-rootfs::