Skip to content

Justfile: Two minor tweaks #1746

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 13, 2025
Merged

Justfile: Two minor tweaks #1746

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b0868
Justfile: Add a label for locally built images and cleanup helper
cgwalters Nov 8, 2025
52b5fc7
Justfile: Remove some unused targets
cgwalters Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@
variant := env("BOOTC_variant", "ostree")
base := env("BOOTC_base", "quay.io/centos-bootc/centos-bootc:stream10")

testimage_label := "bootc.testimage=1"
base_buildargs := "--jobs 4 --label=" + testimage_label
buildargs := "--build-arg=base=" + base + " --build-arg=variant=" + variant

# Build the container image from current sources.
# Note commonly you might want to override the base image via e.g.
# `just build --build-arg=base=quay.io/fedora/fedora-bootc:42`
build:
podman build --jobs=4 -t localhost/bootc-bin {{buildargs}} .
podman build {{base_buildargs}} -t localhost/bootc-bin {{buildargs}} .
./tests/build-sealed {{variant}} localhost/bootc-bin localhost/bootc

# This container image has additional testing content and utilities
build-integration-test-image: build
cd hack && podman build --jobs=4 -t localhost/bootc-integration-bin {{buildargs}} -f Containerfile .
cd hack && podman build {{base_buildargs}} -t localhost/bootc-integration-bin {{buildargs}} -f Containerfile .
./tests/build-sealed {{variant}} localhost/bootc-integration-bin localhost/bootc-integration
# Keep these in sync with what's used in hack/lbi
podman pull -q --retry 5 --retry-delay 5s quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.access.redhat.com/ubi9/podman:latest
Expand All @@ -43,30 +45,19 @@ test-composefs:

# Only used by ci.yml right now
build-install-test-image: build-integration-test-image
cd hack && podman build -t localhost/bootc-integration-install -f Containerfile.drop-lbis

build-disk-image container target:
bcvk to-disk --format=qcow2 --disk-size 20G --filesystem ext4 {{container}} {{target}}
cd hack && podman build {{base_buildargs}} -t localhost/bootc-integration-install -f Containerfile.drop-lbis

# These tests accept the container image as input, and may spawn it.
run-container-external-tests:
./tests/container/run localhost/bootc

# We build the unit tests into a container image
build-units:
podman build --jobs=4 --target units -t localhost/bootc-units .
podman build {{base_buildargs}} --target units -t localhost/bootc-units .

# Perform validation (build, linting) in a container build environment
validate:
podman build --jobs=4 --target validate .

# Directly run validation (build, linting) using host tools
validate-local:
make validate

# This generates a disk image (using bcvk) from the default container
build-disk *ARGS:
./tests/build.sh {{ARGS}}
podman build {{base_buildargs}} --target validate .

# Run tmt-based test suites using local virtual machines with
# bcvk.
Expand All @@ -86,12 +77,17 @@ test-container: build-units build-integration-test-image
# Pass these through for cross-checking
podman run --rm --env=BOOTC_variant={{variant}} --env=BOOTC_base={{base}} localhost/bootc-integration bootc-integration-tests container

# Remove all container images built (locally) via this Justfile, by matching a label
clean-local-images:
podman images --filter "label={{testimage_label}}"
podman images --filter "label={{testimage_label}}" --format "{{{{.ID}}" | xargs -r podman rmi -f
Comment on lines +82 to +83
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The clean-local-images target runs podman images twice with the same filter. This is inefficient and can be simplified.

The first command displays the images, and the second one pipes the IDs to podman rmi. You can achieve a similar result more efficiently by using the -q (--quiet) flag to get only the image IDs and piping them directly to xargs. The podman rmi command will output the IDs of the images it removes, which provides sufficient feedback to the user.

    podman images -q --filter "label={{testimage_label}}" | xargs -r podman rmi -f


# Print the container image reference for a given short $ID-VERSION_ID
pullspec-for-os NAME:
@jq -r --arg v "{{NAME}}" '.[$v]' < hack/os-image-map.json

build-mdbook:
cd docs && podman build -t localhost/bootc-mdbook -f Dockerfile.mdbook
cd docs && podman build {{base_buildargs}} -t localhost/bootc-mdbook -f Dockerfile.mdbook

# Generate the rendered HTML to the target DIR directory
build-mdbook-to DIR: build-mdbook
Expand Down