Improve Docker build reliability and add build idempotency:#64
Open
jacobweinstock wants to merge 1 commit into
Open
Improve Docker build reliability and add build idempotency:#64jacobweinstock wants to merge 1 commit into
jacobweinstock wants to merge 1 commit into
Conversation
There was a problem hiding this comment.
Pull request overview
This PR aims to make local/CI Docker-based workflows more reliable and repeatable by ensuring built images are available locally, reducing unnecessary rebuild work, and introducing a dependency lockfile for reproducible Python resolution.
Changes:
- Add
--loadtodocker buildx buildso built images are available in the local Docker daemon. - Add initramfs-stage idempotency by skipping mkosi initramfs rebuild when an output file already exists (unless
--forceis used). - Add
uv.lockand update the builderDockerfileto precreate a persistent venv intended to be reused byuv run.
Reviewed changes
Copilot reviewed 3 out of 4 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
uv.lock |
Introduces a uv lockfile intended to make dependency resolution reproducible. |
captain/docker.py |
Ensures buildx builds load images into the local daemon for subsequent docker run usage. |
captain/cli/_stages.py |
Adds a skip-path to avoid rebuilding initramfs when an existing output is present. |
Dockerfile |
Switches from “priming uv cache” to building a persistent venv at image build time. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
This PR aims to make container-based builds more reliable and reproducible by ensuring build outputs are available locally, dependencies are locked, and certain stages can be skipped when outputs already exist.
Changes:
- Add
uv.lockto pin Python dependency resolution for reproducible installs. - Update Docker build flow to create/use a prebuilt virtualenv in the builder image and to
--loadbuildx outputs into the local Docker daemon. - Add initramfs stage idempotency to skip rebuilds when an initramfs artifact already exists (unless forced).
Reviewed changes
Copilot reviewed 3 out of 4 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
uv.lock |
Introduces a uv lockfile to make dependency resolution reproducible. |
captain/docker.py |
Adds --load to docker buildx build so built images are available in the local daemon. |
captain/cli/_stages.py |
Skips initramfs rebuild when an existing *.cpio* is found unless forced. |
Dockerfile |
Builds a persistent venv and runs uv sync --frozen during image build to avoid recreating envs at runtime. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
Apr 20, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
Apr 20, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
Apr 28, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
May 5, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
May 5, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
May 5, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
May 5, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
rpardini
added a commit
to rpardini/captain
that referenced
this pull request
May 6, 2026
- from tinkerbell#64 Signed-off-by: Ricardo Pardini <ricardo@pardini.net>
- Use glob("*.cpio*") for initramfs skip check, consistent with
artifacts.py and iso.py, so it works regardless of compression format.
- Copy uv.lock into Docker image and use "uv sync --frozen" to enforce
lockfile-pinned dependencies instead of resolving fresh each build.
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
jacobweinstock
force-pushed
the
idempotent
branch
from
32b9e60 to
6de77ed
Compare
| # Install project dependencies into a persistent venv so that | ||
| # `uv run` inside the container reuses it instead of recreating one. | ||
| COPY pyproject.toml /opt/captain/pyproject.toml | ||
| COPY uv.lock /opt/captain/uv.lock |
|
|
||
| # --- idempotency -------------------------------------------------- | ||
| initramfs_image = cfg.initramfs_output / "image.cpio.zst" | ||
| existing = sorted(cfg.initramfs_output.glob("*.cpio*")) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes: #
How Has This Been Tested?
How are existing users impacted? What migration steps/scripts do we need?
Checklist:
I have: