Compare commits
29 Commits
e6cda3ad52
...
renovate/s
| Author | SHA1 | Date | |
|---|---|---|---|
| 0259324114 | |||
| c0e24492c4 | |||
|
e26e359d10
|
|||
|
2e714767a1
|
|||
| dfc4602eee | |||
| 14f9f5e317 | |||
| e1b74380ed | |||
| c79cc1da81 | |||
| 8ee0c408ef | |||
| e1187b326b | |||
| 6c04623646 | |||
| f7676fa5c3 | |||
| 35bc853548 | |||
| 15d8fe22b6 | |||
| 2c6ca7521d | |||
| b641feac89 | |||
| 855b8c0edc | |||
| 11326924bb | |||
|
63ed60d607
|
|||
|
7ea8af6b44
|
|||
| 0cc95dfc14 | |||
| f30d49cb14 | |||
| 69b27ceb42 | |||
| f2fdcdcaa0 | |||
| 838d0c606a | |||
| 68464938a3 | |||
| 7c9890a8d5 | |||
| 80a34851a6 | |||
| 2e43b9b723 |
900
Cargo.lock
generated
900
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,7 @@ dagger-components = { path = "crates/dagger-components" }
|
|||||||
dagger-cuddle-please = { path = "crates/dagger-cuddle-please" }
|
dagger-cuddle-please = { path = "crates/dagger-cuddle-please" }
|
||||||
dagger-rust = { path = "crates/dagger-rust" }
|
dagger-rust = { path = "crates/dagger-rust" }
|
||||||
|
|
||||||
dagger-sdk = "0.13.7"
|
dagger-sdk = "0.18.3"
|
||||||
eyre = "0.6"
|
eyre = "0.6"
|
||||||
tokio = "1"
|
tokio = "1"
|
||||||
dotenv = "0.15.0"
|
dotenv = "0.15.0"
|
||||||
|
|||||||
@@ -56,9 +56,19 @@ pub struct CuddleVars {
|
|||||||
pub service: String,
|
pub service: String,
|
||||||
pub registry: String,
|
pub registry: String,
|
||||||
|
|
||||||
|
pub rust: Option<CuddleRustVars>,
|
||||||
|
|
||||||
pub clusters: Option<CuddleClusters>,
|
pub clusters: Option<CuddleClusters>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
||||||
|
pub struct CuddleRustVars {
|
||||||
|
pub publish: Option<CuddleRustPublishVars>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
||||||
|
pub struct CuddleRustPublishVars {}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
||||||
pub struct CuddleDeployment {
|
pub struct CuddleDeployment {
|
||||||
pub registry: String,
|
pub registry: String,
|
||||||
@@ -168,6 +178,7 @@ scripts:
|
|||||||
service: "infrastructure-example".into(),
|
service: "infrastructure-example".into(),
|
||||||
registry: "kasperhermansen".into(),
|
registry: "kasperhermansen".into(),
|
||||||
clusters: Some(CuddleClusters(clusters)),
|
clusters: Some(CuddleClusters(clusters)),
|
||||||
|
rust: None,
|
||||||
},
|
},
|
||||||
deployment: Some(crate::cuddle_file::CuddleDeployment {
|
deployment: Some(crate::cuddle_file::CuddleDeployment {
|
||||||
registry: "git@git.front.kjuulh.io:kjuulh/clank-clusters".into(),
|
registry: "git@git.front.kjuulh.io:kjuulh/clank-clusters".into(),
|
||||||
@@ -215,6 +226,7 @@ components:
|
|||||||
service: "infrastructure-example".into(),
|
service: "infrastructure-example".into(),
|
||||||
registry: "kasperhermansen".into(),
|
registry: "kasperhermansen".into(),
|
||||||
clusters: None,
|
clusters: None,
|
||||||
|
rust: None,
|
||||||
},
|
},
|
||||||
deployment: None,
|
deployment: None,
|
||||||
components: Some(CuddleComponents {
|
components: Some(CuddleComponents {
|
||||||
@@ -253,6 +265,7 @@ components:
|
|||||||
service: "infrastructure-example".into(),
|
service: "infrastructure-example".into(),
|
||||||
registry: "kasperhermansen".into(),
|
registry: "kasperhermansen".into(),
|
||||||
clusters: None,
|
clusters: None,
|
||||||
|
rust: None,
|
||||||
},
|
},
|
||||||
deployment: None,
|
deployment: None,
|
||||||
components: Some(CuddleComponents {
|
components: Some(CuddleComponents {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ impl MainAction for CuddlePlease {
|
|||||||
|
|
||||||
action
|
action
|
||||||
.cuddle_please_src(&CuddlePleaseSrcArgs {
|
.cuddle_please_src(&CuddlePleaseSrcArgs {
|
||||||
cuddle_image: "kasperhermansen/cuddle-please:main-1712698022".into(),
|
cuddle_image: "kasperhermansen/cuddle-please:main-1736464837".into(),
|
||||||
server: dagger_cuddle_please::models::SrcServer::Gitea {
|
server: dagger_cuddle_please::models::SrcServer::Gitea {
|
||||||
token: std::env::var("CUDDLE_PLEASE_TOKEN")
|
token: std::env::var("CUDDLE_PLEASE_TOKEN")
|
||||||
.expect("CUDDLE_PLEASE_TOKEN to be present"),
|
.expect("CUDDLE_PLEASE_TOKEN to be present"),
|
||||||
|
|||||||
@@ -274,7 +274,7 @@ impl RustService {
|
|||||||
let dest = self
|
let dest = self
|
||||||
.final_image
|
.final_image
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or(client.container().from("debian:bookworm"));
|
.unwrap_or(client.container().from("debian:trixie"));
|
||||||
|
|
||||||
let before_package = self
|
let before_package = self
|
||||||
.stages
|
.stages
|
||||||
|
|||||||
@@ -186,12 +186,11 @@ impl DaggerCuddlePlease {
|
|||||||
self.client
|
self.client
|
||||||
.git_opts(
|
.git_opts(
|
||||||
&repo_url,
|
&repo_url,
|
||||||
dagger_sdk::QueryGitOpts {
|
dagger_sdk::QueryGitOptsBuilder::default()
|
||||||
experimental_service_host: None,
|
.keep_git_dir(true)
|
||||||
keep_git_dir: Some(true),
|
.ssh_auth_socket(socket.id().await?)
|
||||||
ssh_auth_socket: Some(socket.id().await?),
|
.build()
|
||||||
ssh_known_hosts: None,
|
.unwrap(),
|
||||||
},
|
|
||||||
)
|
)
|
||||||
.branch("main")
|
.branch("main")
|
||||||
.tree()
|
.tree()
|
||||||
@@ -199,12 +198,10 @@ impl DaggerCuddlePlease {
|
|||||||
self.client
|
self.client
|
||||||
.git_opts(
|
.git_opts(
|
||||||
&repo_url,
|
&repo_url,
|
||||||
dagger_sdk::QueryGitOpts {
|
dagger_sdk::QueryGitOptsBuilder::default()
|
||||||
experimental_service_host: None,
|
.keep_git_dir(true)
|
||||||
keep_git_dir: Some(true),
|
.build()
|
||||||
ssh_auth_socket: None,
|
.unwrap(),
|
||||||
ssh_known_hosts: None,
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
.branch("main")
|
.branch("main")
|
||||||
.tree()
|
.tree()
|
||||||
|
|||||||
Reference in New Issue
Block a user