pie doesn't mesh with scratch image

2023-09-10 00:50:04 -04:00 · 2023-09-10 00:50:04 -04:00 · 2a666c84cb
parent 32b9f5e836
commit 2a666c84cb
2 changed files with 3 additions and 6 deletions
--- a/6
+++ b/6
@ -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"]
--- a/3
+++ b/3
@ -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