kjuulh/cuddle-v2
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

feat: update with ssh agent support

Browse Source 
Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2023-07-27 15:24:04 +02:00
parent 68b46e4bec
commit a17c5d1421
Signed by: kjuulh
GPG Key ID: 9AA7BC13CE474394
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.drone.yml
View File

@ -26,6 +26,7 @@ steps:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
commands: commands:
- ssh-add
- cuddle x build_cuddle_image - cuddle x build_cuddle_image
environment: environment:
DOCKER_BUILDKIT: 1 DOCKER_BUILDKIT: 1

16
cuddle_cli/src/context.rs
View File

@ -121,12 +121,16 @@ fn pull_parent_cuddle_into_local(
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let mut rc = RemoteCallbacks::new(); let mut rc = RemoteCallbacks::new();
rc.credentials(|_url, username_from_url, _allowed_types| { rc.credentials(|_url, username_from_url, _allowed_types| {
git2::Cred::ssh_key( if "true".to_string() == std::env::var("CUDDLE_SSH_AGENT").ok().unwrap_or("".into()) {
username_from_url.unwrap(), git2::Cred::ssh_key_from_agent(username_from_url.unwrap())
None, } else {
Path::new(&format!("{}/.ssh/id_ed25519", env::var("HOME").unwrap())), git2::Cred::ssh_key(
None, username_from_url.unwrap(),
) None,
Path::new(&format!("{}/.ssh/id_ed25519", env::var("HOME").unwrap())),
None,
)
}
}); });
let mut fo = FetchOptions::new(); let mut fo = FetchOptions::new();

1
templates/build_cuddle_image.Dockerfile
View File

@ -21,6 +21,7 @@ RUN cargo install --target x86_64-unknown-linux-musl --path cuddle_cli
FROM docker:dind FROM docker:dind
RUN apk add bash git RUN apk add bash git
RUN eval `ssh-agent`
COPY --from=1password/op:2 /usr/local/bin/op /usr/local/bin/op COPY --from=1password/op:2 /usr/local/bin/op /usr/local/bin/op