[docker] Enable image builds from git worktrees #3660
Merged
Conversation
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
marun
force-pushed
the
worktree-image-builds
branch
5 times, most recently
from
4573e47 to
f32daa7
Compare
This change enables docker image builds from [git worktrees](https://git-scm.com/docs/git-worktree). This required discoverying the git commit used to configure the avalanchego build script in advance of image build and providing it as an argument to image build. Previously, it was impossible to build docker images from a git worktree: - the avalanchego build script needed to discover the git commit to configure the binary with for traceability - the build script assumed a .git directory to discover the git commit - the dockerfile copied the working tree into the image prior to running the avalanchego build script - if the working tree was for a git worktree, the resulting copy wouldn't have a .git directory to discovery the git commit from - instead of a regular .git directory, a non-primary worktree has a .git file referencing a path in the primary worktree's .git directory.
maru-ava
force-pushed
the
worktree-image-builds
branch
from
6c4b75e to
e676c36
Compare
maru-ava
force-pushed
the
worktree-image-builds
branch
from
8fa265f to
ec0e81c
Compare
michaelkaplan13
approved these changes
Jan 24, 2025
StephenButtolph
approved these changes
Jan 27, 2025
tsachiherman
pushed a commit
that referenced
this pull request
Jan 29, 2025
Co-authored-by: Maru Newby <[email protected]>
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.
Why this should be merged
This change enables docker image builds from git worktrees. This required discoverying the git commit used to configure the avalanchego build script in advance of image build and providing it as an argument to image build.
Previously, it was impossible to build docker images from a git worktree:
How this was tested
CI
Need to be documented in RELEASES.md?
N/A