microshift-bootc: convert to svc

Author: mangelajo

deploy/microshift-bootc/Containerfile

@@ -1,6 +1,18 @@
 FROM ghcr.io/microshift-io/microshift:release-4.20-4.20.0-okd-scos.9
 
+# Install dependencies for config-svc
+RUN dnf install -y epel-release && \
+    dnf install -y python3 iproute python3-flask python3-pip && \
+    pip3 install python-pam && \
+    dnf clean all
+
+# Install config-svc systemd service
+COPY deploy/microshift-bootc/config-svc/app.py /usr/local/bin/config-svc
+RUN chmod +x /usr/local/bin/config-svc
+COPY deploy/microshift-bootc/config-svc/config-svc.service /etc/systemd/system/config-svc.service
+RUN systemctl enable config-svc.service
+
+# Install MicroShift manifests
 RUN mkdir -p /usr/lib/microshift/manifests.d/002-jumpstarter
 COPY deploy/microshift-bootc/kustomization.yaml       /usr/lib/microshift/manifests.d/002-jumpstarter/kustomization.yaml
 COPY deploy/operator/dist/install.yaml                /usr/lib/microshift/manifests.d/002-jumpstarter/install-operator.yaml
-COPY deploy/microshift-bootc/config-svc/manifest.yaml /usr/lib/microshift/manifests.d/002-jumpstarter/config-svc.yaml

deploy/microshift-bootc/Makefile

@@ -1,7 +1,6 @@
-.PHONY: help build build-config-svc build-bootc push push-config-svc push-bootc
+.PHONY: help build build-bootc push push-bootc
 
 # Default image tags
-CONFIG_SVC_IMG ?= quay.io/jumpstarter-dev/microshift/config-svc:latest
 BOOTC_IMG ?= quay.io/jumpstarter-dev/microshift/bootc:latest
 
 
@@ -10,11 +9,7 @@ help: ## Display this help
 
 ##@ Build
 
-build: build-config-svc ## Build config-svc container (default target)
-
-build-config-svc: ## Build the config-svc container image
-	@echo "Building config-svc container: $(CONFIG_SVC_IMG)"
-	cd config-svc && podman build -t $(CONFIG_SVC_IMG) -f Containerfile .
+build: build-bootc ## Build bootc image (default target)
 
 build-bootc: ## Build the bootc image with MicroShift
 	@echo "Building bootc image: $(BOOTC_IMG): buinding as root to be on the container storage from root"
@@ -39,27 +34,28 @@ output/qcow2/disk.qcow2: ## Build a bootable QCOW2 image from the bootc image
 		$(BOOTC_IMG)
 	@echo "QCOW2 image built successfully in ./output/"
 
-##@ Push
+build-image: build-bootc ## Build the the bootc based qcow2 image
+	@echo "Building image: output/qcow2/disk.qcow2"
+	sudo rm  output/qcow2/disk.qcow2
+	make output/qcow2/disk.qcow2
+	@echo "Image built successfully in ./output/"
 
-push: push-config-svc ## Push config-svc container to registry
+##@ Push
 
-push-config-svc: ## Push the config-svc container image to registry
-	@echo "Pushing config-svc container: $(CONFIG_SVC_IMG)"
-	podman push $(CONFIG_SVC_IMG)
+push: push-bootc ## Push bootc image to registry
 
 push-bootc: ## Push the bootc image to registry
 	@echo "Pushing bootc image: $(BOOTC_IMG)"
 	podman push $(BOOTC_IMG)
 
 ##@ Development
 
-build-all: build-config-svc build-bootc ## Build both config-svc and bootc images
+build-all: build-bootc ## Build bootc image
 
-push-all: push-config-svc push-bootc ## Push both images to registry
+push-all: push-bootc ## Push bootc image to registry
 
 clean: ## Clean up local images and build artifacts
 	@echo "Removing local images..."
-	-podman rmi $(CONFIG_SVC_IMG)
 	-podman rmi $(BOOTC_IMG)
 	@echo "Removing QCOW2 output..."
 	-sudo rm -rf output/qcow2/disk.qcow2