Add git-crypt wrapper
#195
Draft
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
As well as Dockerfile to build the image (In a future commit we shall make the CI push the docker image on our AWS ECR public registry and point to it instead of building it locally)
And fix path used in git filters to rely on $PATH resolution so that it works in both situations of being needed by git from inside and outside the container
Generated by 🚫 Danger |
And remove `auto-unlock` magic command after all, because if we end up pre-installing `git-crypt` on our CI agents (Mac machines, custom AMIs…) and put it at the head of `$PATH` and would take priority (as the helpers from this Buildkite plugin are added at the tail of $PATH), we won't risk client repos that were previously calling `git-crypt auto-unlock` from that helper would suddenly fail.
AliSoftware
force-pushed
the
git-crypt-unlock
branch
from
2d3483a to
e79b4e5
Compare
wzieba
reviewed
Nov 17, 2025
Comment on lines
+7
to
+9
| Indeed, while `git-crypt` is easy to install on macOS platforms via a simple `brew install git-crypt`, it is not always as easy to install on all other platforms: | ||
| - While some Linux distributions may have versions of `git-crypt` available via `yum install`/`dnf install`/`apk add`/…, they might not always have the latest version. | ||
| - Support for `git-crypt` on Windows platforms is at its infancy, less tested and harder to compile on that platform to begin with. |
Contributor
Author
|
I believe the test failure on CI is unrelated to this PR and might instead be related to our recent changes to those scripts, or how the test tries to source those scripts for testing (especially as @mokagio Care to take a look to fix that unrelated part (in a separate PR)? |
Merged
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.
What?
This PR adds
bin/git-crypthelper which is a wrapper to callgit-cryptvia docker.bin/are added at the end of$PATH, this means that ifgit-cryptis pre-installed in the agent your job runs (e.g. if we ever include it in our Mac agents or custom AMIs), that pre-installedgit-cryptwill take priority over that helper provided by theci-toolkit.git-cryptis not available elsewhere in the path will callinggit-cryptbe resolved to this helper at the end of the$PATH, which will wrap the call indocker runappropriatelyAdded
git-crypt/*files and WIPThis PR also adds
git-crypt/Dockerfileand its accompanyinggit-crypt/README.mdto rebuild the docker image when necessary and document the process.Currently this
Dockerfileis used todocker buildthe docker image on demand every time, because that docker image hasn't been pushed to a registry yet.🚧 In a future commit we shall make the CI build and push the docker image to our AWS ECR public registry (then update
docker_imagevariable in the script to point to it), so that the image is not rebuild from scratch on every job.TODO
CHANGELOG.mdif necessary.