From 54ce5552dd1bdf5f287dc389df39022883afc076 Mon Sep 17 00:00:00 2001 From: Kornilios Kourtis Date: Thu, 22 Feb 2024 13:22:15 +0100 Subject: [PATCH] backport: use main's Makefile.cli Signed-off-by: Kornilios Kourtis --- Makefile.cli | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.cli b/Makefile.cli index f8c883aa74d..db181a6a77e 100644 --- a/Makefile.cli +++ b/Makefile.cli @@ -1,7 +1,9 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright Authors of Tetragon -GO_BUILD = CGO_ENABLED=0 $(GO) build -tags standalone +CLI_GO_BUILD = CGO_ENABLED=0 $(GO) build +# renovate: datasource=docker +GO_IMAGE = docker.io/library/golang:1.22.0-alpine@sha256:8e96e6cff6a388c2f70f5f662b64120941fcd7d4b89d62fec87520323a316bd9 TARGET=tetra RELEASE_UID ?= $(shell id -u) @@ -11,7 +13,7 @@ cli-release: docker run \ --rm \ --workdir /tetragon \ - --volume `pwd`:/tetragon docker.io/library/golang:1.19.0-alpine3.16 \ + --volume `pwd`:/tetragon $(GO_IMAGE) \ sh -c "apk add --no-cache make git setpriv && \ /usr/bin/setpriv --reuid=$(RELEASE_UID) --regid=$(RELEASE_GID) --clear-groups \ make GOCACHE=/tmp/cache cli-local-release VERSION=${VERSION}" @@ -36,7 +38,7 @@ cli-local-release: cli-clean for ARCH in $$ARCHS; do \ echo Building release binary for $$OS/$$ARCH...; \ test -d release/$$OS/$$ARCH|| mkdir -p release/$$OS/$$ARCH; \ - env GOOS=$$OS GOARCH=$$ARCH $(GO_BUILD) -ldflags=$(GO_LDFLAGS) -o release/$$OS/$$ARCH/$(TARGET)$$EXT ./cmd/tetra; \ + env GOOS=$$OS GOARCH=$$ARCH $(CLI_GO_BUILD) -ldflags="$(GO_BUILD_LDFLAGS)" -o release/$$OS/$$ARCH/$(TARGET)$$EXT ./cmd/tetra; \ tar -czf release/$(TARGET)-$$OS-$$ARCH.tar.gz -C release/$$OS/$$ARCH $(TARGET)$$EXT; \ (cd release && sha256sum $(TARGET)-$$OS-$$ARCH.tar.gz > $(TARGET)-$$OS-$$ARCH.tar.gz.sha256sum); \ done; \