Compare commits

...

1 Commits

Author SHA1 Message Date
mbecker20
84d45c5df8 0.2.12 fix docker build command interp 2023-03-31 18:06:18 +00:00
10 changed files with 28 additions and 28 deletions

34
Cargo.lock generated
View File

@@ -740,7 +740,7 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]] [[package]]
name = "core" name = "core"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async_timing_util", "async_timing_util",
@@ -759,7 +759,7 @@ dependencies = [
"hmac", "hmac",
"jwt", "jwt",
"monitor_helpers", "monitor_helpers",
"monitor_types 0.2.11", "monitor_types 0.2.12",
"mungos", "mungos",
"periphery_client", "periphery_client",
"serde", "serde",
@@ -993,10 +993,10 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
[[package]] [[package]]
name = "db_client" name = "db_client"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"monitor_types 0.2.11", "monitor_types 0.2.12",
"mungos", "mungos",
] ]
@@ -1857,12 +1857,12 @@ dependencies = [
[[package]] [[package]]
name = "monitor_cli" name = "monitor_cli"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"async_timing_util", "async_timing_util",
"clap", "clap",
"colored", "colored",
"monitor_types 0.2.11", "monitor_types 0.2.12",
"rand", "rand",
"run_command", "run_command",
"serde", "serde",
@@ -1874,12 +1874,12 @@ dependencies = [
[[package]] [[package]]
name = "monitor_client" name = "monitor_client"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"envy", "envy",
"futures-util", "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", "reqwest",
"serde", "serde",
"serde_derive", "serde_derive",
@@ -1891,11 +1891,11 @@ dependencies = [
[[package]] [[package]]
name = "monitor_helpers" name = "monitor_helpers"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"axum", "axum",
"monitor_types 0.2.11", "monitor_types 0.2.12",
"rand", "rand",
"serde", "serde",
"serde_json", "serde_json",
@@ -1904,7 +1904,7 @@ dependencies = [
[[package]] [[package]]
name = "monitor_periphery" name = "monitor_periphery"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async_timing_util", "async_timing_util",
@@ -1916,7 +1916,7 @@ dependencies = [
"envy", "envy",
"futures", "futures",
"monitor_helpers", "monitor_helpers",
"monitor_types 0.2.11", "monitor_types 0.2.12",
"run_command", "run_command",
"serde", "serde",
"serde_derive", "serde_derive",
@@ -1930,7 +1930,7 @@ dependencies = [
[[package]] [[package]]
name = "monitor_types" name = "monitor_types"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bollard", "bollard",
@@ -1947,9 +1947,9 @@ dependencies = [
[[package]] [[package]]
name = "monitor_types" name = "monitor_types"
version = "0.2.11" version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2b2809cdf9e2c1f1faa0093e6da57e6e4d5833f7dd492df490cc4c66f73a383" checksum = "2c1217ae77c37da0d97762577f4f2606745897de45b8950cc987b965a155dad4"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bollard", "bollard",
@@ -2196,11 +2196,11 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]] [[package]]
name = "periphery_client" name = "periphery_client"
version = "0.2.11" version = "0.2.12"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"futures-util", "futures-util",
"monitor_types 0.2.11", "monitor_types 0.2.12",
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "monitor_cli" name = "monitor_cli"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
authors = ["MoghTech"] authors = ["MoghTech"]
description = "monitor cli | tools to setup monitor system" description = "monitor cli | tools to setup monitor system"

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "core" name = "core"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "db_client" name = "db_client"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "monitor_helpers" name = "monitor_helpers"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
authors = ["MoghTech"] authors = ["MoghTech"]
description = "helpers used as dependency for mogh tech monitor" description = "helpers used as dependency for mogh tech monitor"

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "monitor_client" name = "monitor_client"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
authors = ["MoghTech"] authors = ["MoghTech"]
description = "a client to interact with the monitor system" 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 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
monitor_types = "0.2.11" monitor_types = "0.2.12"
reqwest = { version = "0.11", features = ["json"] } reqwest = { version = "0.11", features = ["json"] }
tokio-tungstenite = { version = "0.18", features=["native-tls"] } tokio-tungstenite = { version = "0.18", features=["native-tls"] }
tokio = { version = "1.25", features = ["full"] } tokio = { version = "1.25", features = ["full"] }

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "periphery_client" name = "periphery_client"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "monitor_types" name = "monitor_types"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
authors = ["MoghTech"] authors = ["MoghTech"]
description = "types for the mogh tech monitor" description = "types for the mogh tech monitor"

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "monitor_periphery" name = "monitor_periphery"
version = "0.2.11" version = "0.2.12"
edition = "2021" edition = "2021"
authors = ["MoghTech"] authors = ["MoghTech"]
description = "monitor periphery binary" description = "monitor periphery binary"

View File

@@ -62,7 +62,7 @@ pub async fn build(
String::new() String::new()
}; };
let command = format!( 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() build_dir.display()
); );
if *skip_secret_interp { 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 { fn image_tags(image_name: &str, version: &Version) -> String {
format!( format!(
"-t {} -t {}", " -t {} -t {}",
get_version_image_name(image_name, version), get_version_image_name(image_name, version),
get_latest_image_name(image_name) get_latest_image_name(image_name)
) )