fixup podvm_mkosi makefile

Run as sudo to avoid permissions error !fixup podvm-mkosi: permissions for nix and skip qcow2 docker image build
confidential-containers · Oct 28, 2024 · 146438d · 146438d
1 parent bf65fe5
commit 146438d
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/src/cloud-api-adaptor/podvm-mkosi/Makefile b/src/cloud-api-adaptor/podvm-mkosi/Makefile
@@ -88,16 +88,16 @@ else ifeq ($(ARCH),s390x)
 	sudo -E ../hack/build-s390x-image.sh
 else
 	touch resources/buildBootableImage
-	nix develop ..#podvm-mkosi --command mkosi --environment=VARIANT_ID=production
+	sudo -E env PATH=$(PATH) nix develop ..#podvm-mkosi --command mkosi --environment=VARIANT_ID=production
 	qemu-img convert -f raw -O qcow2 build/system.raw build/podvm-amd64.qcow2
 endif
-	@echo "Building docker image..."
-	sudo chown -R $(USER): build
-	docker buildx build \
-		-t $(PODVM_IMAGE) \
-		--build-arg ARCH=$(ARCH) \
-		$(DOCKER_OPTS) \
-		-f ../podvm/Dockerfile.podvm.fedora .
+# @echo "Building docker image..."
+# sudo chown -R $(USER): build
+# docker buildx build \
+# 	-t $(PODVM_IMAGE) \
+# 	--build-arg ARCH=$(ARCH) \
+# 	$(DOCKER_OPTS) \
+# 	-f ../podvm/Dockerfile.podvm.fedora .
 
 PHONY: image-debug
 image-debug:
@@ -118,17 +118,17 @@ else ifeq ($(ARCH),s390x)
 	@echo "Building docker image..."
 else
 	touch resources/buildBootableImage
-	nix develop ..#podvm-mkosi --command mkosi --environment=VARIANT_ID=debug
+	sudo -E env PATH=$(PATH) nix develop ..#podvm-mkosi --command mkosi --environment=VARIANT_ID=debug
 	qemu-img convert -f raw -O qcow2 build/system.raw build/podvm-amd64.qcow2
 endif
-	sudo chown -R $(USER): build
-# TODO - once we ditch the packer approach we should consider using oras to wrap
-# the qcow2, rather than our own very similar approach
-	docker buildx build \
-		-t $(addsuffix -debug,$(PODVM_IMAGE)) \
-		--build-arg ARCH=$(ARCH) \
-		$(DOCKER_OPTS) \
-		-f ../podvm/Dockerfile.podvm.fedora .
+# 	sudo chown -R $(USER): build
+# # TODO - once we ditch the packer approach we should consider using oras to wrap
+# # the qcow2, rather than our own very similar approach
+# 	docker buildx build \
+# 		-t $(addsuffix -debug,$(PODVM_IMAGE)) \
+# 		--build-arg ARCH=$(ARCH) \
+# 		$(DOCKER_OPTS) \
+# 		-f ../podvm/Dockerfile.podvm.fedora .
 
 PHONY: image-container
 image-container: