kjuulh/cuddle-node-service-plan
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: kjuulh:05f98cea655ee5c26ad81a085386987c3d84af10
Branches Tags
kjuulh:main kjuulh:renovate/all
...
compare: kjuulh:ab61a5b89ff25ddc84651fc2165d79a2e2ef6abf
Branches Tags
kjuulh:renovate/all kjuulh:main

2 Commits
05f98cea65 ... ab61a5b89f

Author SHA1 Message Date
kjuulh
ab61a5b89f feat: use new dagger connect closure
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Signed-off-by: kjuulh <contact@kjuulh.io>
 2024-12-26 22:55:14 +01:00
kjuulh
027e375baa feat: update dagger 
Signed-off-by: kjuulh <contact@kjuulh.io>
 2024-12-26 22:53:13 +01:00
7 changed files with 647 additions and 403 deletions
Expand all files Collapse all files

4
.drone.yml
View File

@@ -68,7 +68,7 @@ steps:
from_secret: docker_password
DOCKER_USERNAME:
from_secret: docker_username
DOCKER_HOST: "tcp://192.168.1.233:2376"
DOCKER_HOST: "tcp://192.168.1.155:2376"
CUDDLE_SECRETS_PROVIDER: 1password
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
CUDDLE_SSH_AGENT: "true"
@@ -128,7 +128,7 @@ steps:
GIT_PASSWORD:
from_secret: git_password
CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.233:2376"
DOCKER_HOST: "tcp://192.168.1.155:2376"
CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN:

946
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
ci/Cargo.toml
View File

@@ -8,7 +8,7 @@ edition = "2021"
[dependencies]
tokio.workspace = true
dagger-sdk = "0.9.8"
dagger-sdk = "0.13.7"
eyre = { version = "0.6.12" }
dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }

66
ci/src/main.rs
View File

@@ -7,40 +7,44 @@ const BIN_NAME: &str = "cuddle-node-service-plan";
#[tokio::main]
async fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect().await?;
dagger_sdk::connect(|client| async move {
let service = &RustService::from(client.clone())
.with_arch(Architecture::Amd64)
.with_os(Os::Linux)
.with_apt(&[
"clang",
"libssl-dev",
"libz-dev",
"libgit2-dev",
"git",
"openssh-client",
])
.with_apt_release(&["git", "openssh-client"])
.with_docker_cli()
.with_cuddle_cli()
.with_kubectl()
.with_apt_ca_certificates()
.with_crates(["ci", "crates/*"])
.with_mold("2.3.3")
.with_bin_name(BIN_NAME)
.with_deployment(false)
.to_owned();
let service = &RustService::from(client.clone())
.with_arch(Architecture::Amd64)
.with_os(Os::Linux)
.with_apt(&[
"clang",
"libssl-dev",
"libz-dev",
"libgit2-dev",
"git",
"openssh-client",
])
.with_apt_release(&["git", "openssh-client"])
.with_docker_cli()
.with_cuddle_cli()
.with_kubectl()
.with_apt_ca_certificates()
.with_crates(["ci", "crates/*"])
.with_mold("2.3.3")
.with_bin_name(BIN_NAME)
.with_deployment(false)
.to_owned();
let drone_templater =
&DroneTemplater::new(client, "templates/cuddle-node-service-plan.yaml")
.with_variable("bin_name", BIN_NAME)
.to_owned();
let drone_templater = &DroneTemplater::new(client, "templates/cuddle-node-service-plan.yaml")
.with_variable("bin_name", BIN_NAME)
.to_owned();
CuddleCI::default()
.with_pull_request(service)
.with_main(service)
.with_main(drone_templater)
.execute(std::env::args())
.await?;
CuddleCI::default()
.with_pull_request(service)
.with_main(service)
.with_main(drone_templater)
.execute(std::env::args())
.await?;
Ok(())
})
.await?;
Ok(())
}

2
crates/cuddle-node-service-plan/Cargo.toml
View File

@@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
tokio.workspace = true
dagger-sdk = "0.9.8"
dagger-sdk = "0.13.7"
eyre = { version = "0.6.12" }
dagger-components = { git = "https://git.front.kjuulh.io/kjuulh/dagger-components", branch = "main" }

26
crates/cuddle-node-service-plan/src/main.rs
View File

@@ -5,19 +5,23 @@ use cuddle_ci::CuddleCI;
#[tokio::main]
async fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect().await?;
let cuddle_file = CuddleFile::from_cuddle_file().await?;
dagger_sdk::connect(|client| async move {
let cuddle_file = CuddleFile::from_cuddle_file().await?;
let service = &NodeService::new(client.clone(), &cuddle_file.vars.service)
.with_arch(Architecture::Amd64)
.with_os(Os::Linux)
.to_owned();
let service = &NodeService::new(client.clone(), &cuddle_file.vars.service)
.with_arch(Architecture::Amd64)
.with_os(Os::Linux)
.to_owned();
CuddleCI::default()
.with_pull_request(service)
.with_main(service)
.execute(std::env::args())
.await?;
CuddleCI::default()
.with_pull_request(service)
.with_main(service)
.execute(std::env::args())
.await?;
Ok(())
})
.await?;
Ok(())
}

4
templates/cuddle-node-service-plan.yaml
View File

@@ -63,7 +63,7 @@ steps:
GIT_PASSWORD:
from_secret: git_password
CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.233:2376"
DOCKER_HOST: "tcp://192.168.1.155:2376"
CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN:
@@ -112,7 +112,7 @@ steps:
GIT_PASSWORD:
from_secret: git_password
CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.233:2376"
DOCKER_HOST: "tcp://192.168.1.155:2376"
CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN: