Merge pull request #2915 from Nordix/fix-DWARF-debug

🌱 Fix DWARF debugging info

Author: k8s-ci-robot

Dockerfile

@@ -36,13 +36,13 @@ COPY ./ ./
 # Build
 ARG package=.
 ARG ARCH
-ARG ldflags=-s -w -extldflags=-static
+ARG ldflags
 
 # Do not force rebuild of up-to-date packages (do not use -a) and use the compiler cache folder
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/go/pkg/mod \
     CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} \
-    go build -ldflags "${ldflags}" \
+    go build -ldflags "${ldflags} -extldflags '-static'" \
     -o manager ${package}
 
 # Production image

Makefile

@@ -402,17 +402,18 @@ generate-api-docs-%: $(GEN_CRD_API_REFERENCE_DOCS) FORCE
 ## --------------------------------------
 
 .PHONY: docker-build
-docker-build: ## Build the docker image for controller-manager
+docker-build: ## Build the docker image for controller-manager without debug info
 	docker build -f Dockerfile --build-arg GO_VERSION=$(GO_VERSION) \
 	--build-arg goproxy=$(GOPROXY) \
-	--build-arg ARCH=$(ARCH) . -t $(CONTROLLER_IMG_TAG)
+	--build-arg ARCH=$(ARCH) \
+	--build-arg ldflags="$(LDFLAGS) -s -w" . -t $(CONTROLLER_IMG_TAG)
 
 .PHONY: docker-build-debug
 docker-build-debug: ## Build the docker image for controller-manager with debug info
 	docker build -f Dockerfile --build-arg GO_VERSION=$(GO_VERSION) \
 	--build-arg goproxy=$(GOPROXY) \
 	--build-arg ARCH=$(ARCH) \
-	--build-arg ldflags="-extldflags=-static" . -t $(CONTROLLER_IMG_TAG)
+	--build-arg ldflags="$(LDFLAGS)" . -t $(CONTROLLER_IMG_TAG)
 
 .PHONY: docker-push
 docker-push: ## Push the docker image