Merge pull request #869 from marquiz/backports/release-0.7

[release 0.7] backport image building fixes

Author: marquiz

Makefile

@@ -276,11 +276,10 @@ libexec/%.o: elf/%.c
 	$(Q)$(CLANG) -nostdinc -D __KERNEL__ $(KERNEL_INCLUDES) -O2 -Wall -target bpf -c $< -o $@
 
 bin/%: .static.%.$(STATIC)
-	$(Q)bin=$(notdir $@); src=cmd/$$bin; \
+	$(Q)bin=$(notdir $@); src=./cmd/$$bin; \
 	echo "Building $$([ -n "$(STATIC)" ] && echo 'static ')$@ (version $(BUILD_VERSION), build $(BUILD_BUILDID))..."; \
 	mkdir -p bin && \
-	cd $$src && \
-	    $(GO_BUILD) $(BUILD_TAGS) $(LDFLAGS) $(GCFLAGS) -o ../../bin/$$bin
+	$(GO_BUILD) $(BUILD_TAGS) $(LDFLAGS) $(GCFLAGS) -o bin/ $$src
 
 .static.%.$(STATIC):
 	$(Q)if [ ! -f "$@" ]; then \

cmd/cri-resmgr-agent/Dockerfile

@@ -12,7 +12,7 @@ RUN go mod download
 # Build webhook, fully statically linked binary
 COPY . .
 
-RUN CGO_ENABLED=0 make BUILD_DIRS="cri-resmgr-agent cri-resmgr-agent-probe"
+RUN CGO_ENABLED=0 make build-static BUILD_DIRS="cri-resmgr-agent cri-resmgr-agent-probe"
 
 FROM scratch as final
 

cmd/cri-resmgr-webhook/Dockerfile

@@ -12,7 +12,7 @@ RUN go mod download
 # Build webhook, fully statically linked binary
 COPY . .
 
-RUN CGO_ENABLED=0 make BUILD_DIRS=cri-resmgr-webhook
+RUN CGO_ENABLED=0 make build-static BUILD_DIRS=cri-resmgr-webhook
 
 FROM scratch as final