feat: update Makefile to improve artifact handling with enhanced logging

Author: adilhusain-s

Makefile

@@ -51,26 +51,26 @@ python-versions/output/python-$(PYTHON_VERSION)-linux-$(ARCH).tar.gz: powershell
 		--build-arg TARGETARCH=$(ARCH) \
 		--build-arg BASE_IMAGE=$(BASE_IMAGE) \
 		-t $(IMAGE_NAME) . || exit 1; \
-	# Use a deterministic temporary container name so we can reliably copy
-	# artifacts out of the image even if the runtime prints nothing (some
-	# container engines/modes may not return an id to backticks reliably).
-	# note: TEMP_CONTAINER_NAME is defined above at Makefile parse time.
-	# Ensure no stale container exists with the same name
-	$(CONTAINER_ENGINE) rm -f $(TEMP_CONTAINER_NAME) 2>/dev/null || true; \
-	# Create a stopped container from the built image so we can `cp` files out
-	# (use --name to guarantee a usable identifier). Fail the make target if
-	# creation does not succeed.
-	$(CONTAINER_ENGINE) create --name $(TEMP_CONTAINER_NAME) python:$(PYTHON_VERSION)-ubuntu-$(UBUNTU_VERSION)-$(ARCH) >/dev/null || (echo "ERROR: failed to create container $(TEMP_CONTAINER_NAME)" && exit 1); \
-	# Copy the produced artifact into the repo output directory. If this fails
-	# we want make to fail so CI can detect the problem.
-	$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/$(ARTIFACT_NAME) $(abspath ../$(OUTPUT_DIR))/$(ARTIFACT_NAME) || (echo "ERROR: failed to copy artifact from $(TEMP_CONTAINER_NAME)" && $(CONTAINER_ENGINE) rm -f $(TEMP_CONTAINER_NAME) >/dev/null 2>&1 || true; exit 1); \
-	# Also try to copy SBOM and Trivy JSON reports from the image (if present)
-	# Do not fail the build if these optional reports are absent.
-	$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/python-$(PYTHON_VERSION)-$(ARCH).sbom.json $(abspath ../$(OUTPUT_DIR))/python-$(PYTHON_VERSION)-linux-$(UBUNTU_VERSION)-$(ARCH).sbom.json || true; \
-	$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/trivy-$(PYTHON_VERSION)-$(ARCH)-vuln.json $(abspath ../$(OUTPUT_DIR))/trivy-python-$(PYTHON_VERSION)-linux-$(UBUNTU_VERSION)-$(ARCH)-vuln.json || true; \
-	$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/trivy-$(PYTHON_VERSION)-$(ARCH)-secret.json $(abspath ../$(OUTPUT_DIR))/trivy-python-$(PYTHON_VERSION)-linux-$(UBUNTU_VERSION)-$(ARCH)-secret.json || true; \
-	# Clean up the temporary container
-	$(CONTAINER_ENGINE) rm -f $(TEMP_CONTAINER_NAME) >/dev/null 2>&1 || true
+	@# Use a deterministic temporary container name so we can reliably copy
+	@# artifacts out of the image even if the runtime prints nothing (some
+	@# container engines/modes may not return an id to backticks reliably).
+	@# note: TEMP_CONTAINER_NAME is defined above at Makefile parse time.
+	@# Ensure no stale container exists with the same name
+	@$(CONTAINER_ENGINE) rm -f $(TEMP_CONTAINER_NAME) 2>/dev/null || true; \
+	@# Create a stopped container from the built image so we can `cp` files out
+	@# (use --name to guarantee a usable identifier). Fail the make target if
+	@# creation does not succeed.
+	@$(CONTAINER_ENGINE) create --name $(TEMP_CONTAINER_NAME) $(IMAGE_NAME) >/dev/null || (echo "ERROR: failed to create container $(TEMP_CONTAINER_NAME)" && exit 1); \
+	@# Copy the produced artifact into the repo output directory. If this fails
+	@# we want make to fail so CI can detect the problem.
+	@$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/$(ARTIFACT_NAME) $(abspath ../$(OUTPUT_DIR))/$(ARTIFACT_NAME) || (echo "ERROR: failed to copy artifact from $(TEMP_CONTAINER_NAME)" && $(CONTAINER_ENGINE) rm -f $(TEMP_CONTAINER_NAME) >/dev/null 2>&1 || true; exit 1); \
+	@# Also try to copy SBOM and Trivy JSON reports from the image (if present)
+	@# Do not fail the build if these optional reports are absent.
+	@$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/python-$(PYTHON_VERSION)-$(ARCH).sbom.json $(abspath ../$(OUTPUT_DIR))/python-$(PYTHON_VERSION)-linux-$(UBUNTU_VERSION)-$(ARCH).sbom.json || true; \
+	@$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/trivy-$(PYTHON_VERSION)-$(ARCH)-vuln.json $(abspath ../$(OUTPUT_DIR))/trivy-python-$(PYTHON_VERSION)-linux-$(UBUNTU_VERSION)-$(ARCH)-vuln.json || true; \
+	@$(CONTAINER_ENGINE) cp $(TEMP_CONTAINER_NAME):/tmp/artifact/trivy-$(PYTHON_VERSION)-$(ARCH)-secret.json $(abspath ../$(OUTPUT_DIR))/trivy-python-$(PYTHON_VERSION)-linux-$(UBUNTU_VERSION)-$(ARCH)-secret.json || true; \
+	@# Clean up the temporary container
+	@$(CONTAINER_ENGINE) rm -f $(TEMP_CONTAINER_NAME) >/dev/null 2>&1 || true
 
 powershell: PowerShell/Dockerfile \
 	PowerShell/patch/powershell-native-$(POWERSHELL_NATIVE_VERSION).patch \