pie doesn't mesh with scratch image

This commit is contained in:
techknowlogick 2023-09-10 00:50:04 -04:00
parent 32b9f5e836
commit 2a666c84cb
2 changed files with 3 additions and 6 deletions

View File

@ -1,10 +1,10 @@
FROM cgr.dev/chainguard/go:latest AS buildenv FROM cgr.dev/chainguard/go:latest AS build
COPY . /build/ COPY . /build/
WORKDIR /build WORKDIR /build
RUN make clean build STATIC=true RUN make build
FROM cgr.dev/chainguard/static:latest FROM cgr.dev/chainguard/static:latest
COPY --from=buildenv /build/tea /tea COPY --from=build /build/tea /tea
VOLUME [ "/app" ] VOLUME [ "/app" ]
ENV HOME="/app" ENV HOME="/app"
ENTRYPOINT ["/tea"] ENTRYPOINT ["/tea"]

View File

@ -37,9 +37,6 @@ ifeq ($(OS), Windows_NT)
else else
EXECUTABLE := tea EXECUTABLE := tea
VET_TOOL := gitea-vet VET_TOOL := gitea-vet
ifneq ($(shell uname -s), OpenBSD)
override BUILDMODE := -buildmode=pie
endif
endif endif
.PHONY: all .PHONY: all