Compare commits
2 Commits
68b46e4bec
...
83a8b5729e
| Author | SHA1 | Date | |
|---|---|---|---|
|
83a8b5729e
|
|||
|
a17c5d1421
|
@@ -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
|
||||||
@@ -35,6 +36,7 @@ steps:
|
|||||||
from_secret: docker_password
|
from_secret: docker_password
|
||||||
CUDDLE_SECRETS_PROVIDER: 1password
|
CUDDLE_SECRETS_PROVIDER: 1password
|
||||||
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
|
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
|
||||||
|
CUDDLE_SSH_AGENT: "true"
|
||||||
OP_SERVICE_ACCOUNT_TOKEN:
|
OP_SERVICE_ACCOUNT_TOKEN:
|
||||||
from_secret: op_service_account_token
|
from_secret: op_service_account_token
|
||||||
|
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user