fix core dockerfile

This commit is contained in:
mbecker20
2023-07-14 06:24:22 +00:00
parent 2a1b719f67
commit 1c1172e0e7
4 changed files with 51 additions and 10 deletions

6
.vscode/tasks.json vendored
View File

@@ -44,7 +44,7 @@
"command": "run",
"label": "run core",
"options": {
"cwd": "${workspaceFolder}/core"
"cwd": "${workspaceFolder}/bin/core"
},
"presentation": {
"group": "start"
@@ -55,7 +55,7 @@
"command": "run",
"label": "run periphery",
"options": {
"cwd": "${workspaceFolder}/periphery"
"cwd": "${workspaceFolder}/bin/periphery"
}
},
{
@@ -63,7 +63,7 @@
"command": "run",
"label": "run tests",
"options": {
"cwd": "${workspaceFolder}/tests"
"cwd": "${workspaceFolder}/bin/tests"
}
},
{

View File

@@ -3,7 +3,7 @@ WORKDIR /builder
COPY . .
RUN cd core && cargo build --release
RUN cd bin/core && cargo build --release
FROM gcr.io/distroless/cc

View File

@@ -92,7 +92,7 @@ pub fn router() -> Router {
Json(request): Json<ReadRequest>| async move {
let timer = Instant::now();
let req_id = Uuid::new_v4();
info!(
debug!(
"/read request {req_id} | user: {} ({}) | {request:?}",
user.username, user.id
);
@@ -101,11 +101,11 @@ pub fn router() -> Router {
.await
.map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, format!("{e:#?}")));
if let Err(e) = &res {
info!("/read request {req_id} ERROR: {e:#?}");
warn!("/read request {req_id} ERROR: {e:#?}");
}
let res = res?;
let elapsed = timer.elapsed();
info!("/read request {req_id} | resolve time: {elapsed:?}");
debug!("/read request {req_id} | resolve time: {elapsed:?}");
Result::<_, (StatusCode, String)>::Ok((TypedHeader(ContentType::json()), res))
},
),

View File

@@ -1,7 +1,11 @@
use monitor_client::MonitorClient;
use monitor_types::{
entities::{repo::PartialRepoConfig, server::PartialServerConfig},
requests::{read, write},
entities::{
build::{BuildBuilderConfig, PartialBuildConfig},
repo::PartialRepoConfig,
server::PartialServerConfig,
},
requests::{execute, read, write},
};
#[allow(unused)]
@@ -10,10 +14,47 @@ pub async fn tests() -> anyhow::Result<()> {
let monitor = MonitorClient::new_from_env().await?;
let mut builds = monitor.read(read::ListBuilds { query: None }).await?;
let build_id = builds.pop().unwrap().id;
run_build(&monitor, build_id).await?;
Ok(())
}
#[allow(unused)]
async fn run_build(monitor: &MonitorClient, build_id: String) -> anyhow::Result<()> {
println!("running build...");
let update = monitor.execute(execute::RunBuild { build_id }).await?;
println!("{update:#?}");
Ok(())
}
#[allow(unused)]
async fn create_build(monitor: &MonitorClient) -> anyhow::Result<()> {
let mut res = monitor.read(read::ListServers { query: None }).await?;
let server_id = res.pop().unwrap().id;
let build = monitor
.write(write::CreateBuild {
name: String::from("monitor-core"),
config: PartialBuildConfig {
repo: "mbecker20/monitor".to_string().into(),
branch: "next".to_string().into(),
builder: BuildBuilderConfig::Server {
server_id: server_id.clone(),
}
.into(),
dockerfile_path: "bin/core/Dockerfile".to_string().into(),
..Default::default()
},
})
.await?;
println!("{build:#?}");
Ok(())
}