From 2a666c84cb8c15ae4b73d3a5b9b8f61e8f911c04 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Sun, 10 Sep 2023 00:50:04 -0400
Subject: [PATCH] pie doesn't mesh with scratch image

---
 Dockerfile | 6 +++---
 Makefile   | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b14a2f2..b93a5f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM cgr.dev/chainguard/go:latest AS buildenv
+FROM cgr.dev/chainguard/go:latest AS build
 COPY . /build/
 WORKDIR /build
-RUN	make clean build STATIC=true
+RUN	make build
 
 FROM cgr.dev/chainguard/static:latest
-COPY --from=buildenv /build/tea /tea
+COPY --from=build /build/tea /tea
 VOLUME [ "/app" ]
 ENV HOME="/app"
 ENTRYPOINT ["/tea"]
diff --git a/Makefile b/Makefile
index a2198aa..52fc31a 100644
--- a/Makefile
+++ b/Makefile
@@ -37,9 +37,6 @@ ifeq ($(OS), Windows_NT)
 else
 	EXECUTABLE := tea
 	VET_TOOL := gitea-vet
-	ifneq ($(shell uname -s), OpenBSD)
-		override BUILDMODE := -buildmode=pie
-	endif
 endif
 
 .PHONY: all