github-starred/komodo
2
0
Fork 1
mirror of https://github.com/moghtech/komodo.git synced 2026-04-27 03:38:46 -05:00
Code Issues 2.6k Packages Projects Releases 103 Wiki Activity

v0.1.10 make default --network host

Browse Source
This commit is contained in:
mbecker20
2023-01-25 04:01:01 +00:00
parent 9db26a3037
commit c86880ccdb
12 changed files with 208 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
Cargo.lock generated
View File

@@ -36,9 +36,9 @@ checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
[[package]]
name = "async-trait"
version = "0.1.61"
version = "0.1.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
checksum = "eff18d764974428cf3a9328e23fc5c986f5fbed46e6cd4cdf42544df5d297ec1"
dependencies = [
"proc-macro2",
"quote",
@@ -77,9 +77,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "axum"
version = "0.6.2"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e"
checksum = "e5694b64066a2459918d8074c2ce0d5a88f409431994c2356617c8ae0c4721fc"
dependencies = [
"async-trait",
"axum-core",
@@ -113,9 +113,9 @@ dependencies = [
[[package]]
name = "axum-core"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8"
checksum = "1cae3e661676ffbacb30f1a824089a8c9150e71017f7e1e38f2aa32009188d34"
dependencies = [
"async-trait",
"bytes",
@@ -174,6 +174,12 @@ version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5"
[[package]]
name = "base64"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
[[package]]
name = "bcrypt"
version = "0.13.0"
@@ -334,9 +340,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.1.1"
version = "4.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2"
checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
dependencies = [
"bitflags",
"clap_derive",
@@ -392,7 +398,7 @@ dependencies = [
[[package]]
name = "core"
version = "0.1.8"
version = "0.1.10"
dependencies = [
"anyhow",
"async_timing_util",
@@ -408,8 +414,8 @@ dependencies = [
"hex",
"hmac",
"jwt",
"monitor_helpers 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_helpers 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"mungos",
"periphery_client",
"serde",
@@ -514,9 +520,9 @@ dependencies = [
[[package]]
name = "cxx"
version = "1.0.86"
version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
checksum = "b61a7545f753a88bcbe0a70de1fcc0221e10bfc752f576754fa91e663db1622e"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -526,9 +532,9 @@ dependencies = [
[[package]]
name = "cxx-build"
version = "1.0.86"
version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
checksum = "f464457d494b5ed6905c63b0c4704842aba319084a0a3561cdc1359536b53200"
dependencies = [
"cc",
"codespan-reporting",
@@ -541,15 +547,15 @@ dependencies = [
[[package]]
name = "cxxbridge-flags"
version = "1.0.86"
version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
checksum = "43c7119ce3a3701ed81aca8410b9acf6fc399d2629d057b87e2efa4e63a3aaea"
[[package]]
name = "cxxbridge-macro"
version = "1.0.86"
version = "1.0.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
checksum = "65e07508b90551e610910fa648a1878991d367064997a596135b86df30daf07e"
dependencies = [
"proc-macro2",
"quote",
@@ -644,10 +650,10 @@ checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
[[package]]
name = "db_client"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"mungos",
]
@@ -1350,9 +1356,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
[[package]]
name = "matches"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
[[package]]
name = "matchit"
@@ -1483,16 +1489,16 @@ dependencies = [
"serde_derive",
"strum",
"strum_macros",
"toml",
"toml 0.5.11",
]
[[package]]
name = "monitor_client"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"futures-util",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest",
"serde",
"serde_derive",
@@ -1504,7 +1510,7 @@ dependencies = [
[[package]]
name = "monitor_helpers"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"async_timing_util",
@@ -1512,20 +1518,20 @@ dependencies = [
"bollard",
"futures",
"futures-util",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"rand",
"run_command",
"serde",
"serde_derive",
"serde_json",
"toml",
"toml 0.6.0",
]
[[package]]
name = "monitor_helpers"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bdf204175ca05633efbfa86b880bd22ee314ac76819a6d2c9019588da8e9170"
checksum = "be55fd1c4d2dc82a223f96c81ac825b6c0e6b955eedb3542e03d1a75a9df94a7"
dependencies = [
"anyhow",
"async_timing_util",
@@ -1533,18 +1539,18 @@ dependencies = [
"bollard",
"futures",
"futures-util",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"rand",
"run_command",
"serde",
"serde_derive",
"serde_json",
"toml",
"toml 0.6.0",
]
[[package]]
name = "monitor_periphery"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"async_timing_util",
@@ -1555,8 +1561,8 @@ dependencies = [
"dotenv",
"envy",
"futures-util",
"monitor_helpers 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_helpers 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"run_command",
"serde",
"serde_derive",
@@ -1564,13 +1570,13 @@ dependencies = [
"sysinfo",
"tokio",
"tokio-util",
"toml",
"toml 0.5.11",
"tower",
]
[[package]]
name = "monitor_types"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"bollard",
@@ -1587,9 +1593,9 @@ dependencies = [
[[package]]
name = "monitor_types"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3aca535e1ee2dc290df0a39eb86af0bf1ac8b425db6755949ed45b0efb53a32a"
checksum = "baa4230da5cad59b690e3f97b24396b11e1e716cfa530ca79aebc8aae9d39e36"
dependencies = [
"anyhow",
"bollard",
@@ -1637,6 +1643,15 @@ dependencies = [
"tempfile",
]
[[package]]
name = "nom8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
dependencies = [
"memchr",
]
[[package]]
name = "ntapi"
version = "0.4.0"
@@ -1673,9 +1688,9 @@ dependencies = [
[[package]]
name = "num-complex"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19"
checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
dependencies = [
"num-traits",
]
@@ -1839,12 +1854,12 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
[[package]]
name = "periphery_client"
version = "0.1.9"
version = "0.1.10"
dependencies = [
"anyhow",
"futures-util",
"monitor_helpers 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_helpers 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"monitor_types 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest",
"serde",
"serde_json",
@@ -1986,9 +2001,9 @@ dependencies = [
[[package]]
name = "rayon-core"
version = "1.10.1"
version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3"
checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b"
dependencies = [
"crossbeam-channel",
"crossbeam-deque",
@@ -2016,11 +2031,11 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.11.13"
version = "0.11.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9"
dependencies = [
"base64 0.13.1",
"base64 0.21.0",
"bytes",
"encoding_rs",
"futures-core",
@@ -2106,9 +2121,9 @@ dependencies = [
[[package]]
name = "rustix"
version = "0.36.6"
version = "0.36.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
dependencies = [
"bitflags",
"errno",
@@ -2184,9 +2199,9 @@ dependencies = [
[[package]]
name = "security-framework"
version = "2.7.0"
version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721"
dependencies = [
"bitflags",
"core-foundation",
@@ -2197,9 +2212,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
version = "2.6.1"
version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4"
dependencies = [
"core-foundation-sys",
"libc",
@@ -2270,6 +2285,15 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_spanned"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c68e921cef53841b8925c2abadd27c9b891d9613bdc43d6b823062866df38e8"
dependencies = [
"serde",
]
[[package]]
name = "serde_urlencoded"
version = "0.7.1"
@@ -2670,13 +2694,47 @@ dependencies = [
[[package]]
name = "toml"
version = "0.5.10"
version = "0.5.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f"
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
dependencies = [
"serde",
]
[[package]]
name = "toml"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729bfd096e40da9c001f778f5cdecbd2957929a24e10e5883d9392220a751581"
dependencies = [
"indexmap",
"nom8",
"serde",
"serde_spanned",
"toml_datetime",
]
[[package]]
name = "tower"
version = "0.4.13"
@@ -2877,9 +2935,9 @@ dependencies = [
[[package]]
name = "unicode-bidi"
version = "0.3.8"
version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
[[package]]
name = "unicode-ident"

6
core/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "core"
version = "0.1.8"
version = "0.1.10"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -8,8 +8,8 @@ edition = "2021"
[dependencies]
# helpers = { package = "monitor_helpers", path = "../lib/helpers" }
# types = { package = "monitor_types", path = "../lib/types" }
helpers = { package = "monitor_helpers", version = "0.1.9" }
types = { package = "monitor_types", version = "0.1.9" }
helpers = { package = "monitor_helpers", version = "0.1.10" }
types = { package = "monitor_types", version = "0.1.10" }
db = { package = "db_client", path = "../lib/db_client" }
periphery = { package = "periphery_client", path = "../lib/periphery_client" }
axum_oauth2 = { path = "../lib/axum_oauth2" }

107
frontend/src/components/deployment/tabs/config/container/Ports.tsx
View File

@@ -18,55 +18,74 @@ const Ports: Component<{}> = (p) => {
setDeployment("docker_run_args", "ports", (ports) => ports!.filter((_, i) => i !== index));
};
return (
<Grid class={combineClasses("config-item shadow")}>
<Flex alignItems="center" justifyContent="space-between">
<h1>ports</h1>
<Flex alignItems="center">
<Show when={!deployment.docker_run_args.ports || deployment.docker_run_args.ports.length === 0}>
<div>none</div>
</Show>
<Show when={userCanUpdate()}>
<button class="green" onClick={onAdd}>
<Icon type="plus" />
</button>
</Show>
</Flex>
</Flex>
<For each={deployment.docker_run_args.ports}>
{({ local, container }, index) => (
<Flex
justifyContent={userCanUpdate() ? "space-between" : undefined}
alignItems="center"
style={{ "flex-wrap": "wrap" }}
>
<Input
placeholder="system"
value={local}
style={{ width: "40%" }}
onEdit={(value) =>
setDeployment("docker_run_args", "ports", index(), "local", value)
<Show when={deployment.docker_run_args.network !== "host"}>
<Grid class={combineClasses("config-item shadow")}>
<Flex alignItems="center" justifyContent="space-between">
<h1>ports</h1>
<Flex alignItems="center">
<Show
when={
!deployment.docker_run_args.ports ||
deployment.docker_run_args.ports.length === 0
}
disabled={!userCanUpdate()}
/>
{" : "}
<Input
placeholder="container"
value={container}
style={{ width: "40%" }}
onEdit={(value) =>
setDeployment("docker_run_args", "ports", index(), "container", value)
}
disabled={!userCanUpdate()}
/>
>
<div>none</div>
</Show>
<Show when={userCanUpdate()}>
<button class="red" onClick={() => onRemove(index())}>
<Icon type="minus" />
<button class="green" onClick={onAdd}>
<Icon type="plus" />
</button>
</Show>
</Flex>
)}
</For>
</Grid>
</Flex>
<For each={deployment.docker_run_args.ports}>
{({ local, container }, index) => (
<Flex
justifyContent={userCanUpdate() ? "space-between" : undefined}
alignItems="center"
style={{ "flex-wrap": "wrap" }}
>
<Input
placeholder="system"
value={local}
style={{ width: "40%" }}
onEdit={(value) =>
setDeployment(
"docker_run_args",
"ports",
index(),
"local",
value
)
}
disabled={!userCanUpdate()}
/>
{" : "}
<Input
placeholder="container"
value={container}
style={{ width: "40%" }}
onEdit={(value) =>
setDeployment(
"docker_run_args",
"ports",
index(),
"container",
value
)
}
disabled={!userCanUpdate()}
/>
<Show when={userCanUpdate()}>
<button class="red" onClick={() => onRemove(index())}>
<Icon type="minus" />
</button>
</Show>
</Flex>
)}
</For>
</Grid>
</Show>
);
};

4
lib/db_client/Cargo.toml
View File

@@ -1,12 +1,12 @@
[package]
name = "db_client"
version = "0.1.9"
version = "0.1.10"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
types = { package = "monitor_types", version = "0.1.9" }
types = { package = "monitor_types", version = "0.1.10" }
# types = { package = "monitor_types", path = "../types" }
mungos = "0.3.0"
anyhow = "1.0"

6
lib/helpers/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "monitor_helpers"
version = "0.1.9"
version = "0.1.10"
edition = "2021"
authors = ["MoghTech"]
description = "helpers used as dependency for mogh tech monitor"
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later"
[dependencies]
# types = { package = "monitor_types", path = "../types" }
types = { package = "monitor_types", version = "0.1.9" }
types = { package = "monitor_types", version = "0.1.10" }
async_timing_util = "0.1.14"
bollard = "0.13"
anyhow = "1.0"
@@ -18,7 +18,7 @@ axum = { version = "0.6", features = ["ws", "json"] }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
toml = "0.5"
toml = "0.6"
run_command = { version = "0.0.5", features = ["async_tokio"] }
rand = "0.8"
futures = "0.3"

8
lib/helpers/src/docker/container.rs
View File

@@ -154,12 +154,8 @@ fn parse_environment(environment: &Vec<EnvironmentVar>) -> String {
.join("")
}
fn parse_network(network: &Option<String>) -> String {
if let Some(network) = network {
format!(" --network {network}")
} else {
String::new()
}
fn parse_network(network: &str) -> String {
format!(" --network {network}")
}
fn parse_restart(restart: &RestartMode) -> String {

4
lib/monitor_client/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "monitor_client"
version = "0.1.9"
version = "0.1.10"
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.1.9"
monitor_types = "0.1.10"
# monitor_types = { path = "../types" }
reqwest = { version = "0.11", features = ["json"] }
tokio-tungstenite = { version = "0.18", features=["native-tls"] }

6
lib/periphery_client/Cargo.toml
View File

@@ -1,13 +1,13 @@
[package]
name = "periphery_client"
version = "0.1.9"
version = "0.1.10"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
helpers = { package = "monitor_helpers", version = "0.1.9" }
types = { package = "monitor_types", version = "0.1.9" }
helpers = { package = "monitor_helpers", version = "0.1.10" }
types = { package = "monitor_types", version = "0.1.10" }
# types = { package = "monitor_types", path = "../types" }
# helpers = { package = "monitor_helpers", path = "../helpers" }
tokio-tungstenite = { version = "0.18", features=["native-tls"] }

2
lib/types/Cargo.toml
View File

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

9
lib/types/src/deployment.rs
View File

@@ -109,8 +109,9 @@ pub struct DockerRunArgs {
#[diff(attr(#[serde(skip_serializing_if = "vec_diff_no_change")]))]
pub environment: Vec<EnvironmentVar>,
#[diff(attr(#[serde(skip_serializing_if = "option_diff_no_change")]))]
pub network: Option<String>,
#[serde(default = "default_network")]
#[diff(attr(#[serde(skip_serializing_if = "Option::is_none")]))]
pub network: String,
#[serde(default)]
#[diff(attr(#[serde(skip_serializing_if = "restart_mode_diff_no_change")]))]
@@ -130,6 +131,10 @@ pub struct DockerRunArgs {
pub docker_account: Option<String>, // the username of the dockerhub account
}
fn default_network() -> String {
String::from("host")
}
#[typeshare]
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct BasicContainerInfo {

2
lib/types/src/diff.rs
View File

@@ -30,9 +30,9 @@ pub fn vec_diff_no_change<T: Diff>(vec_diff: &VecDiff<T>) -> bool {
pub fn docker_run_args_diff_no_change(dra: &DockerRunArgsDiff) -> bool {
dra.image.is_none()
&& dra.network.is_none()
&& option_diff_no_change(&dra.container_user)
&& option_diff_no_change(&dra.docker_account)
&& option_diff_no_change(&dra.network)
&& option_diff_no_change(&dra.post_image)
&& vec_diff_no_change(&dra.environment)
&& vec_diff_no_change(&dra.ports)

6
periphery/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "monitor_periphery"
version = "0.1.9"
version = "0.1.10"
edition = "2021"
authors = ["MoghTech"]
description = "monitor periphery binary | run monitor periphery as system daemon"
@@ -15,8 +15,8 @@ path = "src/main.rs"
[dependencies]
# helpers = { package = "monitor_helpers", path = "../lib/helpers" }
# types = { package = "monitor_types", path = "../lib/types" }
helpers = { package = "monitor_helpers", version = "0.1.9" }
types = { package = "monitor_types", version = "0.1.9" }
helpers = { package = "monitor_helpers", version = "0.1.10" }
types = { package = "monitor_types", version = "0.1.10" }
run_command = { version = "0.0.5", features = ["async_tokio"] }
async_timing_util = "0.1.14"
tokio = { version = "1.24", features = ["full"] }