-
Notifications
You must be signed in to change notification settings - Fork 10
microshift-image: create a booc microshift based image #201
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from 5 commits
99bf0a7
275d81f
e4f97c1
d19de62
0ea2aa4
7a9a93c
d26b469
1139439
b0b0911
7ef45e7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| 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 | ||
coderabbitai[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # Install MicroShift manifests | ||
| RUN mkdir -p /etc/microshift/manifests.d/002-jumpstarter | ||
| COPY deploy/microshift-bootc/kustomization.yaml /etc/microshift/manifests.d/002-jumpstarter/kustomization.yaml | ||
| COPY deploy/operator/dist/install.yaml /etc/microshift/manifests.d/002-jumpstarter/install-operator.yaml | ||
|
|
||
| # Configure firewalld to open required ports | ||
| # Use firewall-offline-cmd since firewalld is not running during build | ||
| RUN firewall-offline-cmd --add-service=http && \ | ||
| firewall-offline-cmd --add-service=https && \ | ||
| firewall-offline-cmd --add-port=8880/tcp | ||
|
|
||
| # Set root password | ||
| RUN echo "root:jumpstarter" | chpasswd | ||
mangelajo marked this conversation as resolved.
Show resolved
Hide resolved
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can't this be set in config.toml?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then it doesn't work when ran as a container :D
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Mor detail, we have make bootc-run that starts microshift+jumpstarter in a bootc container, it's quick and nice for iterating on the development before creating an image and flashing something. |
||
|
|
||
| # 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/update-banner.sh /usr/local/bin/update-banner.sh | ||
| RUN chmod +x /usr/local/bin/update-banner.sh | ||
| COPY deploy/microshift-bootc/config-svc/config-svc.service /etc/systemd/system/config-svc.service | ||
| COPY deploy/microshift-bootc/config-svc/update-banner.service /etc/systemd/system/update-banner.service | ||
| RUN systemctl enable config-svc.service update-banner.service | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| .PHONY: help build bootc-build push bootc-push bootc-run bootc-stop bootc-sh bootc-rm build-image build-iso | ||
|
|
||
| # Default image tags | ||
| BOOTC_IMG ?= quay.io/jumpstarter-dev/microshift/bootc:latest | ||
|
|
||
|
|
||
| help: ## Display this help | ||
| @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-20s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) | ||
|
|
||
| ##@ Build | ||
|
|
||
| build: bootc-build ## Build bootc image (default target) | ||
|
|
||
| bootc-build: ## Build the bootc image with MicroShift | ||
| @echo "Building bootc image: $(BOOTC_IMG): building as root to be on the container storage from root" | ||
| sudo podman build -t $(BOOTC_IMG) -f Containerfile ../.. | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I wonder if there is a way of building the bootc container as user, but then copying to the root container storage when you want to build the image, also we need to look at how this is possibly usable from MacOS, I'll fight that on a 2nd round. |
||
|
|
||
| output/qcow2/disk.qcow2: ## Build a bootable QCOW2 image from the bootc image | ||
| @echo "Building QCOW2 image from: $(BOOTC_IMG)" | ||
| @echo "Running bootc-image-builder..." | ||
| @mkdir -p output | ||
| sudo podman run \ | ||
| --rm \ | ||
| -it \ | ||
mangelajo marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| --privileged \ | ||
| --pull=newer \ | ||
| --security-opt label=type:unconfined_t \ | ||
| -v ./config.toml:/config.toml:ro \ | ||
| -v ./output:/output \ | ||
| -v /var/lib/containers/storage:/var/lib/containers/storage \ | ||
| quay.io/centos-bootc/bootc-image-builder:latest \ | ||
| --type qcow2 \ | ||
| -v \ | ||
| $(BOOTC_IMG) | ||
| @echo "QCOW2 image built successfully in ./output/" | ||
|
|
||
| output/iso/disk.iso: ## Build a bootable ISO image from the bootc image | ||
| @echo "Building ISO image from: $(BOOTC_IMG)" | ||
| @echo "Running bootc-image-builder..." | ||
| @mkdir -p output | ||
| sudo podman run \ | ||
| --rm \ | ||
| -it \ | ||
| --privileged \ | ||
| --pull=newer \ | ||
| --security-opt label=type:unconfined_t \ | ||
| -v ./config.toml:/config.toml:ro \ | ||
| -v ./output:/output \ | ||
| -v /var/lib/containers/storage:/var/lib/containers/storage \ | ||
| quay.io/centos-bootc/bootc-image-builder:latest \ | ||
| --type iso \ | ||
| -v \ | ||
| $(BOOTC_IMG) | ||
| @echo "ISO image built successfully in ./output/" | ||
|
|
||
| build-image: bootc-build ## Build the bootc based qcow2 image | ||
| @echo "Building image: output/qcow2/disk.qcow2" | ||
| @echo "Cleaning up any existing LVM resources to avoid conflicts..." | ||
| -sudo vgs --noheadings -o vg_name,vg_uuid | grep myvg1 | while read vg uuid; do sudo vgremove -f --select vg_uuid=$$uuid 2>/dev/null || true; done | ||
| -sudo losetup -D 2>/dev/null || true | ||
| sudo rm -f output/qcow2/disk.qcow2 | ||
| make output/qcow2/disk.qcow2 | ||
| @echo "Image built successfully in ./output/" | ||
|
|
||
| build-iso: bootc-build ## Build the bootc based ISO image | ||
| @echo "Building ISO image: output/iso/disk.iso" | ||
| @echo "Cleaning up any existing LVM resources to avoid conflicts..." | ||
| -sudo vgs --noheadings -o vg_name,vg_uuid | grep myvg1 | while read vg uuid; do sudo vgremove -f --select vg_uuid=$$uuid 2>/dev/null || true; done | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't remember doing this when building bootc images, it lvm necessary?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is something that needs to be cleaned up, if you ran the container locally the run-microshift.sh stolen from their repo and modified... creates a loop back device to mount the PVs. |
||
| -sudo losetup -D 2>/dev/null || true | ||
| sudo rm -f output/iso/disk.iso | ||
| make output/iso/disk.iso | ||
| @echo "ISO image built successfully in ./output/" | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add a build-ks-iso: target with INPUT_ISO=fedora/centos10 by using a mkksiso from lorax + the netboot isos of fedora/centos10 I managed to make a 1GB iso that just downloads the latests bootc container at install time. We should probably just publish that somewhere :) the one generated in build-iso is 3G although it comes with the whole bootc image embedded, it will still require the download of the microshift and jumpstarter containers. |
||
|
|
||
| ##@ Push | ||
|
|
||
| push: bootc-push ## Push bootc image to registry | ||
|
|
||
| bootc-push: ## Push the bootc image to registry | ||
| @echo "Pushing bootc image: $(BOOTC_IMG)" | ||
| sudo podman push $(BOOTC_IMG) | ||
|
|
||
| ##@ Development | ||
|
|
||
| build-all: bootc-build ## Build bootc image | ||
|
|
||
| push-all: bootc-push ## Push bootc image to registry | ||
|
|
||
| bootc-run: ## Run MicroShift in a bootc container | ||
| @echo "Running MicroShift container with image: $(BOOTC_IMG)" | ||
| @BOOTC_IMG=$(BOOTC_IMG) sudo -E ./run-microshift.sh | ||
|
|
||
| bootc-stop: ## Stop the running MicroShift container | ||
| @echo "Stopping MicroShift container..." | ||
| -sudo podman stop jumpstarter-microshift-okd | ||
|
|
||
| bootc-rm: bootc-stop ## Remove the MicroShift container | ||
| @echo "Removing MicroShift container..." | ||
| -sudo podman rm -f jumpstarter-microshift-okd | ||
| @echo "Cleaning up LVM resources..." | ||
| -sudo vgremove -f myvg1 2>/dev/null || true | ||
| -sudo losetup -d $$(sudo losetup -j /var/lib/microshift-okd/lvmdisk.image | cut -d: -f1) 2>/dev/null || true | ||
| @echo "LVM cleanup complete" | ||
|
|
||
| bootc-sh: ## Open a shell in the running MicroShift container | ||
| @echo "Opening shell in MicroShift container..." | ||
| sudo podman exec -it jumpstarter-microshift-okd /bin/bash -l | ||
|
|
||
| bootc-reload-app: ## Reload the config service app without rebuilding (dev mode) | ||
| @echo "Reloading config-svc app..." | ||
| sudo podman cp config-svc/app.py jumpstarter-microshift-okd:/usr/local/bin/config-svc | ||
|
||
| sudo podman exec jumpstarter-microshift-okd systemctl restart config-svc | ||
| @echo "Config service reloaded successfully!" | ||
|
|
||
| clean: ## Clean up local images and build artifacts | ||
| @echo "Removing local images..." | ||
| -sudo podman rmi $(BOOTC_IMG) | ||
| @echo "Removing QCOW2 output..." | ||
| -sudo rm -rf output/qcow2/disk.qcow2 | ||
| @echo "Removing ISO output..." | ||
| -sudo rm -rf output/iso/disk.iso | ||
| @echo "Removing LVM disk image..." | ||
| -sudo rm -f /var/lib/microshift-okd/lvmdisk.image | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need a cs10 based image, the miniPC I got for running this has non-supported hardware on cs9, cs10 seems to work.