From 84d45c5df85a53fd398de0bec93283e2551d3877 Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Fri, 31 Mar 2023 18:06:18 +0000 Subject: [PATCH] 0.2.12 fix docker build command interp --- Cargo.lock | 34 +++++++++++++-------------- cli/Cargo.toml | 2 +- core/Cargo.toml | 2 +- lib/db_client/Cargo.toml | 2 +- lib/helpers/Cargo.toml | 2 +- lib/monitor_client/Cargo.toml | 4 ++-- lib/periphery_client/Cargo.toml | 2 +- lib/types/Cargo.toml | 2 +- periphery/Cargo.toml | 2 +- periphery/src/helpers/docker/build.rs | 4 ++-- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aafa4b5d4..2d546efe8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -740,7 +740,7 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", "async_timing_util", @@ -759,7 +759,7 @@ dependencies = [ "hmac", "jwt", "monitor_helpers", - "monitor_types 0.2.11", + "monitor_types 0.2.12", "mungos", "periphery_client", "serde", @@ -993,10 +993,10 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" [[package]] name = "db_client" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", - "monitor_types 0.2.11", + "monitor_types 0.2.12", "mungos", ] @@ -1857,12 +1857,12 @@ dependencies = [ [[package]] name = "monitor_cli" -version = "0.2.11" +version = "0.2.12" dependencies = [ "async_timing_util", "clap", "colored", - "monitor_types 0.2.11", + "monitor_types 0.2.12", "rand", "run_command", "serde", @@ -1874,12 +1874,12 @@ dependencies = [ [[package]] name = "monitor_client" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", "envy", "futures-util", - "monitor_types 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "monitor_types 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest", "serde", "serde_derive", @@ -1891,11 +1891,11 @@ dependencies = [ [[package]] name = "monitor_helpers" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", "axum", - "monitor_types 0.2.11", + "monitor_types 0.2.12", "rand", "serde", "serde_json", @@ -1904,7 +1904,7 @@ dependencies = [ [[package]] name = "monitor_periphery" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", "async_timing_util", @@ -1916,7 +1916,7 @@ dependencies = [ "envy", "futures", "monitor_helpers", - "monitor_types 0.2.11", + "monitor_types 0.2.12", "run_command", "serde", "serde_derive", @@ -1930,7 +1930,7 @@ dependencies = [ [[package]] name = "monitor_types" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", "bollard", @@ -1947,9 +1947,9 @@ dependencies = [ [[package]] name = "monitor_types" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b2809cdf9e2c1f1faa0093e6da57e6e4d5833f7dd492df490cc4c66f73a383" +checksum = "2c1217ae77c37da0d97762577f4f2606745897de45b8950cc987b965a155dad4" dependencies = [ "anyhow", "bollard", @@ -2196,11 +2196,11 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] name = "periphery_client" -version = "0.2.11" +version = "0.2.12" dependencies = [ "anyhow", "futures-util", - "monitor_types 0.2.11", + "monitor_types 0.2.12", "reqwest", "serde", "serde_json", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 0778a2363..82cd0c8ca 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_cli" -version = "0.2.11" +version = "0.2.12" edition = "2021" authors = ["MoghTech"] description = "monitor cli | tools to setup monitor system" diff --git a/core/Cargo.toml b/core/Cargo.toml index 07f393d44..6d69bf76b 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "core" -version = "0.2.11" +version = "0.2.12" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/db_client/Cargo.toml b/lib/db_client/Cargo.toml index 6c332a059..7042ea495 100644 --- a/lib/db_client/Cargo.toml +++ b/lib/db_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "db_client" -version = "0.2.11" +version = "0.2.12" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/helpers/Cargo.toml b/lib/helpers/Cargo.toml index 06f9dc8c5..06e644a52 100644 --- a/lib/helpers/Cargo.toml +++ b/lib/helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_helpers" -version = "0.2.11" +version = "0.2.12" edition = "2021" authors = ["MoghTech"] description = "helpers used as dependency for mogh tech monitor" diff --git a/lib/monitor_client/Cargo.toml b/lib/monitor_client/Cargo.toml index b70191453..367594916 100644 --- a/lib/monitor_client/Cargo.toml +++ b/lib/monitor_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_client" -version = "0.2.11" +version = "0.2.12" edition = "2021" authors = ["MoghTech"] description = "a client to interact with the monitor system" @@ -9,7 +9,7 @@ license = "GPL-3.0-or-later" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -monitor_types = "0.2.11" +monitor_types = "0.2.12" reqwest = { version = "0.11", features = ["json"] } tokio-tungstenite = { version = "0.18", features=["native-tls"] } tokio = { version = "1.25", features = ["full"] } diff --git a/lib/periphery_client/Cargo.toml b/lib/periphery_client/Cargo.toml index 79b96f25c..e23b54828 100644 --- a/lib/periphery_client/Cargo.toml +++ b/lib/periphery_client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "periphery_client" -version = "0.2.11" +version = "0.2.12" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/lib/types/Cargo.toml b/lib/types/Cargo.toml index 010f66559..c639de01f 100644 --- a/lib/types/Cargo.toml +++ b/lib/types/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_types" -version = "0.2.11" +version = "0.2.12" edition = "2021" authors = ["MoghTech"] description = "types for the mogh tech monitor" diff --git a/periphery/Cargo.toml b/periphery/Cargo.toml index ac94e81b4..462d23857 100644 --- a/periphery/Cargo.toml +++ b/periphery/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "monitor_periphery" -version = "0.2.11" +version = "0.2.12" edition = "2021" authors = ["MoghTech"] description = "monitor periphery binary" diff --git a/periphery/src/helpers/docker/build.rs b/periphery/src/helpers/docker/build.rs index 27e062bf5..c9a9d09fc 100644 --- a/periphery/src/helpers/docker/build.rs +++ b/periphery/src/helpers/docker/build.rs @@ -62,7 +62,7 @@ pub async fn build( String::new() }; let command = format!( - "cd {} && docker{buildx} build {build_args}{extra_args}{image_tags} -f {dockerfile_path} .{docker_push}", + "cd {} && docker{buildx} build{build_args}{extra_args}{image_tags} -f {dockerfile_path} .{docker_push}", build_dir.display() ); if *skip_secret_interp { @@ -105,7 +105,7 @@ fn get_latest_image_name(image_name: &str) -> String { fn image_tags(image_name: &str, version: &Version) -> String { format!( - "-t {} -t {}", + " -t {} -t {}", get_version_image_name(image_name, version), get_latest_image_name(image_name) )