diff --git a/Cargo.lock b/Cargo.lock index ce6684d..74b1270 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,21 +28,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anstream" version = "0.6.18" @@ -199,7 +184,7 @@ dependencies = [ "miniz_oxide", "object", "rustc-demangle", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -249,9 +234,9 @@ dependencies = [ [[package]] name = "bollard" -version = "0.18.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ccca1260af6a459d75994ad5acc1651bcabcbdbc41467cc9786519ab854c30" +checksum = "227aa051deec8d16bd9c34605e7aaf153f240e35483dd42f6f78903847934738" dependencies = [ "base64", "bollard-stubs", @@ -270,7 +255,6 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_repr", "serde_urlencoded", "thiserror 2.0.12", "tokio", @@ -282,13 +266,13 @@ dependencies = [ [[package]] name = "bollard-stubs" -version = "1.47.1-rc.27.3.1" +version = "1.52.1-rc.29.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f179cfbddb6e77a5472703d4b30436bff32929c0aa8a9008ecf23d1d3cdd0da" +checksum = "0f0a8ca8799131c1837d1282c3f81f31e76ceb0ce426e04a7fe1ccee3287c066" dependencies = [ "serde", + "serde_json", "serde_repr", - "serde_with", ] [[package]] @@ -361,19 +345,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "chrono" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "serde", - "windows-link 0.1.0", -] - [[package]] name = "cipher" version = "0.4.4" @@ -532,7 +503,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ "powerfmt", - "serde_core", ] [[package]] @@ -808,19 +778,13 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.13.0", + "indexmap", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.15.2" @@ -1045,7 +1009,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -1066,29 +1030,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "iana-time-zone" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "icu_collections" version = "1.5.0" @@ -1234,17 +1175,6 @@ dependencies = [ "icu_properties", ] -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.13.0" @@ -1362,9 +1292,9 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" -version = "0.2.170" +version = "0.2.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" [[package]] name = "libdbus-sys" @@ -1590,15 +1520,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050" -[[package]] -name = "num-traits" -version = "0.2.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" -dependencies = [ - "autocfg", -] - [[package]] name = "numtoa" version = "0.2.4" @@ -1761,7 +1682,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2", + "socket2 0.5.8", "thiserror 2.0.12", "tokio", "tracing", @@ -1798,7 +1719,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.5.8", "tracing", "windows-sys 0.59.0", ] @@ -2181,23 +2102,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" -dependencies = [ - "base64", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.13.0", - "serde", - "serde_derive", - "serde_json", - "time", -] - [[package]] name = "sha1" version = "0.10.6" @@ -2292,6 +2196,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -2504,13 +2418,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", - "itoa", "js-sys", "num-conv", "powerfmt", "serde_core", "time-core", - "time-macros", ] [[package]] @@ -2519,16 +2431,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" -[[package]] -name = "time-macros" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tinystr" version = "0.7.6" @@ -2556,26 +2458,25 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.43.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ - "backtrace", "bytes", "libc", "mio", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.6.2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -2611,7 +2512,7 @@ version = "1.0.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7614eaf19ad818347db24addfa201729cf2a9b6fdfd9eb0ab870fcacc606c0c" dependencies = [ - "indexmap 2.13.0", + "indexmap", "serde_core", "serde_spanned", "toml_datetime", @@ -2958,7 +2859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap", "wasm-encoder", "wasmparser", ] @@ -2971,7 +2872,7 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags", "hashbrown 0.15.2", - "indexmap 2.13.0", + "indexmap", "semver", ] @@ -3017,21 +2918,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-link" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" - [[package]] name = "windows-link" version = "0.2.1" @@ -3046,7 +2932,7 @@ checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result", "windows-strings", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3055,7 +2941,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3065,7 +2951,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ "windows-result", - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3074,7 +2960,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", ] [[package]] @@ -3083,7 +2969,16 @@ version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", ] [[package]] @@ -3092,7 +2987,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -3101,14 +2996,31 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -3117,48 +3029,96 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "winnow" version = "0.7.14" @@ -3193,7 +3153,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck", - "indexmap 2.13.0", + "indexmap", "prettyplease", "syn 2.0.117", "wasm-metadata", @@ -3224,7 +3184,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags", - "indexmap 2.13.0", + "indexmap", "log", "serde", "serde_derive", @@ -3243,7 +3203,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap", "log", "semver", "serde", @@ -3398,7 +3358,7 @@ dependencies = [ "flate2", "getrandom 0.4.1", "hmac", - "indexmap 2.13.0", + "indexmap", "lzma-rust2", "memchr", "pbkdf2", diff --git a/Cargo.toml b/Cargo.toml index c4e25f5..c796a67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT" description = "Easy setup and management of Nextcloud test instances using docker" [dependencies] -bollard = "0.18.1" +bollard = "0.20.1" maplit = "1.0.2" camino = { version = "1.1.7", features = ["serde1"] } tokio = { version = "1.38.0", features = ["fs", "macros", "signal", "rt-multi-thread"] } diff --git a/src/cloud.rs b/src/cloud.rs index ac782bd..79d298c 100644 --- a/src/cloud.rs +++ b/src/cloud.rs @@ -6,9 +6,9 @@ use crate::php::{PhpVersion, PHP_MEMORY_LIMIT}; use crate::service::Service; use crate::service::ServiceTrait; use crate::sources::download_nc; -use bollard::container::{ListContainersOptions, RemoveContainerOptions, UpdateContainerOptions}; -use bollard::models::ContainerState; -use bollard::network::CreateNetworkOptions; +use bollard::config::NetworkCreateRequest; +use bollard::models::{ContainerState, ContainerUpdateBody}; +use bollard::query_parameters::{ListContainersOptions, RemoveContainerOptions}; use bollard::Docker; use camino::{Utf8Path, Utf8PathBuf}; use flate2::read::GzDecoder; @@ -301,8 +301,8 @@ impl Cloud { } let network = docker - .create_network(CreateNetworkOptions { - name: id.as_str(), + .create_network(NetworkCreateRequest { + name: id.clone(), ..Default::default() }) .await @@ -310,7 +310,7 @@ impl Cloud { .id; let network_info = docker - .inspect_network::(&network, None) + .inspect_network(&network, None) .await .into_diagnostic()?; let gateway = network_info @@ -598,7 +598,7 @@ impl Cloud { config: &HazeConfig, ) -> Result> { let containers = docker - .list_containers::(Some(ListContainersOptions { + .list_containers(Some(ListContainersOptions { all: true, ..Default::default() })) @@ -752,9 +752,9 @@ impl Cloud { docker .update_container( &self.id, - UpdateContainerOptions:: { + ContainerUpdateBody { memory: Some(PHP_MEMORY_LIMIT + 1), - ..UpdateContainerOptions::default() + ..ContainerUpdateBody::default() }, ) .await @@ -766,9 +766,9 @@ impl Cloud { docker .update_container( &self.id, - UpdateContainerOptions:: { + ContainerUpdateBody { memory: Some(PHP_MEMORY_LIMIT), - ..UpdateContainerOptions::default() + ..ContainerUpdateBody::default() }, ) .await diff --git a/src/database.rs b/src/database.rs index d621e84..ff969a3 100644 --- a/src/database.rs +++ b/src/database.rs @@ -1,7 +1,8 @@ use crate::exec::{exec, exec_tty, ExitCode}; use crate::image::pull_image; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::config::ContainerCreateBody; +use bollard::models::{EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report, Result, WrapErr}; @@ -193,35 +194,35 @@ impl Database { .wrap_err("Failed to pull database image")?; } let options = Some(CreateContainerOptions { - name: format!("{}-db{}", cloud_id, postfix), + name: Some(format!("{}-db{}", cloud_id, postfix)), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(self.image()), - env: Some(self.env()), + let config = ContainerCreateBody { + image: Some(self.image().into()), + env: Some(self.env().into_iter().map(String::from).collect()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => "db", - "haze-cloud-id" => cloud_id + "haze-type".into() => "db".into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + String::from(network) => EndpointSettings { aliases: Some(vec![ format!("{}{}", self.name(), postfix), format!("db{}", postfix), ]), ..Default::default() } - }, + }), }), cmd: if self.image() == "mysql:8" { Some(vec![ - "--default-authentication-plugin", - "mysql_native_password", + "--default-authentication-plugin".into(), + "mysql_native_password".into(), ]) } else { None @@ -233,10 +234,7 @@ impl Database { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(Some(id)) } diff --git a/src/exec.rs b/src/exec.rs index ec67333..8d07508 100644 --- a/src/exec.rs +++ b/src/exec.rs @@ -1,5 +1,5 @@ -use bollard::container::LogsOptions; use bollard::exec::{CreateExecOptions, ResizeExecOptions, StartExecResults}; +use bollard::query_parameters::LogsOptions; use bollard::Docker; use futures_util::StreamExt; use miette::{IntoDiagnostic, Report, Result, WrapErr}; @@ -189,7 +189,7 @@ pub async fn container_logs( count: usize, follow: bool, ) -> Result<()> { - let mut stream = docker.logs::( + let mut stream = docker.logs( container, Some(LogsOptions { stdout: true, diff --git a/src/image.rs b/src/image.rs index 2ea9b7d..94da352 100644 --- a/src/image.rs +++ b/src/image.rs @@ -1,12 +1,10 @@ -use bollard::image::CreateImageOptions; use bollard::models::CreateImageInfo; +use bollard::query_parameters::CreateImageOptions; use bollard::Docker; use futures_util::StreamExt; +use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; use miette::{IntoDiagnostic, Result, WrapErr}; use std::collections::HashMap; -use std::io::stdout; -use std::io::Write; -use termion::cursor; pub async fn image_exists(docker: &Docker, image: &str) -> bool { docker.inspect_image(image).await.is_ok() @@ -32,9 +30,9 @@ pub async fn force_pull_image(docker: &Docker, image: &str) -> Result<()> { let mut info_stream = docker.create_image( Some(CreateImageOptions { from_image: if image.contains(':') { - image.to_string() + Some(image.to_string()) } else { - format!("{}:latest", image) + Some(format!("{}:latest", image)) }, ..Default::default() }), @@ -42,35 +40,33 @@ pub async fn force_pull_image(docker: &Docker, image: &str) -> Result<()> { None, ); - let mut bars: HashMap = HashMap::new(); + let bar_style = ProgressStyle::with_template( + "{spinner:.green} {msg} [{elapsed_precise}] [{bar:.cyan/blue}] {bytes:>12}/{total_bytes}", + ) + .unwrap(); + let mut bars: HashMap = HashMap::new(); + let mp = MultiProgress::new(); - let mut stdout = stdout(); while let Some(info) = info_stream.next().await { let info: CreateImageInfo = info .into_diagnostic() .wrap_err_with(|| format!("Error while pulling image {}", image))?; - if let (Some(id), Some(status), Some(progress)) = (info.id, info.status, info.progress) { - match bars.get(&id) { - Some(pos) => { - let offset = bars.len() as u16 - pos; - write!( - stdout, - "{}{}{} - {:12} {}{}", - cursor::Save, - cursor::Up(offset), - id, - status, - progress, - cursor::Restore - ) - .into_diagnostic()?; - } - None => { - writeln!(stdout, "{} - {:12} {}", id, status, progress).into_diagnostic()?; - bars.insert(id, bars.len() as u16); - } + if let (Some(id), Some(status), Some(progress)) = + (info.id, info.status, info.progress_detail) + { + let bar = bars.entry(id.clone()).or_insert_with(|| { + let bar = ProgressBar::new(progress.total.unwrap_or_default() as u64) + .with_style(bar_style.clone()) + .with_message(format!("{id:20} - {status:10}")); + mp.add(bar) + }); + bar.set_message(format!("{id:10} - {status:20}")); + if let Some(total) = progress.total { + bar.set_length(total as u64); + } + if let Some(current) = progress.current { + bar.set_position(current as u64); } - stdout.flush().into_diagnostic()?; } } Ok(()) diff --git a/src/network.rs b/src/network.rs index ea589ec..0b25f2c 100644 --- a/src/network.rs +++ b/src/network.rs @@ -1,11 +1,11 @@ use crate::cloud::Cloud; -use bollard::network::CreateNetworkOptions; +use bollard::config::NetworkCreateRequest; use bollard::Docker; use miette::{IntoDiagnostic, Result, WrapErr}; pub async fn clear_networks(docker: &Docker, instances: &[Cloud]) -> Result<()> { let networks = docker - .list_networks::<&str>(None) + .list_networks(None) .await .into_diagnostic() .wrap_err("Failed to list docker networks")?; @@ -23,7 +23,7 @@ pub async fn clear_networks(docker: &Docker, instances: &[Cloud]) -> Result<()> async fn get_network_id(docker: &Docker, name: &str) -> Result> { let networks = docker - .list_networks::<&str>(None) + .list_networks(None) .await .into_diagnostic() .wrap_err("Failed to list docker networks")?; @@ -41,9 +41,8 @@ pub async fn ensure_network_exists(docker: &Docker, name: &str) -> Result EndpointSettings { aliases: Some(vec!["cloud".to_string()]), ..Default::default() } - }, + }), }), labels: Some(labels), ..Default::default() @@ -233,11 +233,7 @@ impl PhpVersion { .into_diagnostic()? .id; - if let Err(e) = docker - .start_container::(&id, None) - .await - .into_diagnostic() - { + if let Err(e) = docker.start_container(&id, None).await.into_diagnostic() { docker.remove_container(&id, None).await.ok(); return Err(e); } @@ -245,12 +241,12 @@ impl PhpVersion { if let Err(e) = docker .connect_network( "haze", - ConnectNetworkOptions { - container: id.as_str(), - endpoint_config: EndpointSettings { + NetworkConnectRequest { + container: id.to_string(), + endpoint_config: Some(EndpointSettings { aliases: Some(vec![id.to_string()]), ..Default::default() - }, + }), }, ) .await diff --git a/src/service.rs b/src/service.rs index 62b84d4..8874352 100644 --- a/src/service.rs +++ b/src/service.rs @@ -142,7 +142,7 @@ pub trait ServiceTrait { return Ok(Box::new(empty())); }; docker - .start_container::(&container, None) + .start_container(&container, None) .await .into_diagnostic()?; self.wait_for_running(docker, cloud_id).await?; diff --git a/src/service/clam.rs b/src/service/clam.rs index 924abd6..74b790d 100644 --- a/src/service/clam.rs +++ b/src/service/clam.rs @@ -4,8 +4,8 @@ use crate::exec::exec; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, WrapErr}; @@ -40,26 +40,26 @@ impl ServiceTrait for ClamIcap { let image = "ghcr.io/icewind1991/icap-clamav-service-tls"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -68,10 +68,7 @@ impl ServiceTrait for ClamIcap { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } @@ -129,26 +126,26 @@ impl ServiceTrait for ClamIcapTls { let image = "ghcr.io/icewind1991/icap-clamav-service-tls"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -157,10 +154,7 @@ impl ServiceTrait for ClamIcapTls { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } @@ -255,26 +249,26 @@ impl ServiceTrait for ClamSocket { let image = "clamav/clamav"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -283,10 +277,7 @@ impl ServiceTrait for ClamSocket { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/dav.rs b/src/service/dav.rs index bfd4904..d328925 100644 --- a/src/service/dav.rs +++ b/src/service/dav.rs @@ -3,8 +3,9 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::config::ContainerCreateBody; +use bollard::models::{EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -29,27 +30,27 @@ impl ServiceTrait for Dav { let image = "ugeek/webdav:amd64"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), - env: Some(vec!["USERNAME=test", "PASSWORD=test"]), + env: Some(vec!["USERNAME=test".into(), "PASSWORD=test".into()]), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -58,10 +59,7 @@ impl ServiceTrait for Dav { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/imaginary.rs b/src/service/imaginary.rs index 986b242..693c173 100644 --- a/src/service/imaginary.rs +++ b/src/service/imaginary.rs @@ -3,8 +3,9 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::config::NetworkingConfig; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -29,26 +30,26 @@ impl ServiceTrait for Imaginary { let image = "nextcloud/aio-imaginary:latest"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -57,10 +58,7 @@ impl ServiceTrait for Imaginary { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/kaspersky.rs b/src/service/kaspersky.rs index 8199429..bc4f08a 100644 --- a/src/service/kaspersky.rs +++ b/src/service/kaspersky.rs @@ -4,8 +4,8 @@ use crate::exec::exec; use crate::image::{image_exists, pull_image}; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::{bail, IntoDiagnostic}; @@ -38,26 +38,26 @@ impl ServiceTrait for Kaspersky { } pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -66,10 +66,7 @@ impl ServiceTrait for Kaspersky { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } @@ -145,26 +142,26 @@ impl ServiceTrait for KasperskyIcap { } pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -173,10 +170,7 @@ impl ServiceTrait for KasperskyIcap { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/ldap.rs b/src/service/ldap.rs index 4868ffe..7526918 100644 --- a/src/service/ldap.rs +++ b/src/service/ldap.rs @@ -3,8 +3,9 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{ContainerState, EndpointSettings, HostConfig}; +use bollard::config::NetworkingConfig; +use bollard::models::{ContainerCreateBody, ContainerState, EndpointSettings, HostConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report}; @@ -33,29 +34,29 @@ impl ServiceTrait for Ldap { let image = "icewind1991/haze-ldap"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), - env: Some(vec!["LDAP_ADMIN_PASSWORD=haze"]), + let config = ContainerCreateBody { + image: Some(image.into()), + env: Some(vec!["LDAP_ADMIN_PASSWORD=haze".into()]), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into() }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), - cmd: Some(vec!["--copy-service"]), + cmd: Some(vec!["--copy-service".into()]), ..Default::default() }; let id = docker @@ -63,10 +64,7 @@ impl ServiceTrait for Ldap { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } @@ -112,29 +110,29 @@ impl ServiceTrait for LdapAdmin { let image = "osixia/phpldapadmin"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), - env: Some(vec!["PHPLDAPADMIN_LDAP_HOSTS=ldap"]), + let config = ContainerCreateBody { + image: Some(image.into()), + env: Some(vec!["PHPLDAPADMIN_LDAP_HOSTS=ldap".into()]), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), - cmd: Some(vec!["--copy-service"]), + cmd: Some(vec!["--copy-service".into()]), ..Default::default() }; let id = docker @@ -142,10 +140,7 @@ impl ServiceTrait for LdapAdmin { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/mail.rs b/src/service/mail.rs index 93a411d..c52fdac 100644 --- a/src/service/mail.rs +++ b/src/service/mail.rs @@ -3,8 +3,8 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -29,26 +29,26 @@ impl ServiceTrait for Mail { let image = "rnwood/smtp4dev"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -57,10 +57,7 @@ impl ServiceTrait for Mail { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/objectstore.rs b/src/service/objectstore.rs index 6522207..2225dca 100644 --- a/src/service/objectstore.rs +++ b/src/service/objectstore.rs @@ -4,8 +4,10 @@ use crate::exec::exec; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{ContainerState, EndpointSettings, HostConfig}; +use bollard::models::{ + ContainerCreateBody, ContainerState, EndpointSettings, HostConfig, NetworkingConfig, +}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -82,28 +84,28 @@ impl ServiceTrait for ObjectStore { ) -> Result> { pull_image(docker, self.image()).await?; let options = Some(CreateContainerOptions { - name: format!("{}-object", cloud_id), + name: Some(format!("{}-object", cloud_id)), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(self.image()), - env: Some(self.self_env()), + let config = ContainerCreateBody { + image: Some(self.image().into()), + env: Some(self.self_env().into_iter().map(String::from).collect()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), - cmd: Some(self.args().into()), + cmd: Some(self.args().iter().copied().map(String::from).collect()), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.host_name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -112,10 +114,7 @@ impl ServiceTrait for ObjectStore { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/oc.rs b/src/service/oc.rs index fcff9e6..2eb3a22 100644 --- a/src/service/oc.rs +++ b/src/service/oc.rs @@ -4,8 +4,9 @@ use crate::exec::exec; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::config::NetworkingConfig; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -33,7 +34,7 @@ impl ServiceTrait for Oc { let image = "owncloud/server:10.12.2"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); let addr = config.proxy.addr( @@ -43,24 +44,24 @@ impl ServiceTrait for Oc { let domain = addr.split_once("://").unwrap().1; let env_trusted_domain = format!("OWNCLOUD_TRUSTED_DOMAINS={domain}"); let env_domain = format!("OWNCLOUD_DOMAIN={domain}"); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), - env: Some(vec![&env_trusted_domain, &env_domain]), + env: Some(vec![env_trusted_domain, env_domain]), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -69,10 +70,7 @@ impl ServiceTrait for Oc { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/office.rs b/src/service/office.rs index 87266a6..4cd72c9 100644 --- a/src/service/office.rs +++ b/src/service/office.rs @@ -3,8 +3,10 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{ContainerState, EndpointSettings, HostConfig}; +use bollard::models::{ + ContainerCreateBody, ContainerState, EndpointSettings, HostConfig, NetworkingConfig, +}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report}; @@ -34,7 +36,7 @@ impl ServiceTrait for Office { pull_image(docker, image).await?; let container_id = self.container_name(cloud_id).unwrap(); let options = Some(CreateContainerOptions { - name: container_id.clone(), + name: Some(container_id.clone()), ..CreateContainerOptions::default() }); let mut env = vec!["extra_params=--o:ssl.enable=false --o:ssl.termination=true"]; @@ -54,24 +56,24 @@ impl ServiceTrait for Office { env.push(&server_name_opt); } - let config = Config { - image: Some(image), - env: Some(env), + let config = ContainerCreateBody { + image: Some(image.into()), + env: Some(env.into_iter().map(String::from).collect()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -80,10 +82,7 @@ impl ServiceTrait for Office { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/onlyoffice.rs b/src/service/onlyoffice.rs index f262c8d..b7c8a14 100644 --- a/src/service/onlyoffice.rs +++ b/src/service/onlyoffice.rs @@ -4,8 +4,10 @@ use crate::exec::exec; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{ContainerState, EndpointSettings, HostConfig}; +use bollard::models::{ + ContainerCreateBody, ContainerState, EndpointSettings, HostConfig, NetworkingConfig, +}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::{IntoDiagnostic, Report}; @@ -35,26 +37,26 @@ impl ServiceTrait for OnlyOffice { let image = "onlyoffice/documentserver"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -63,10 +65,7 @@ impl ServiceTrait for OnlyOffice { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/push.rs b/src/service/push.rs index ed4bf57..22b3ac2 100644 --- a/src/service/push.rs +++ b/src/service/push.rs @@ -2,8 +2,8 @@ use crate::cloud::CloudOptions; use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use local_ip_address::list_afinet_netifas; use maplit::hashmap; @@ -33,11 +33,11 @@ impl ServiceTrait for NotifyPush { let image = "icewind1991/notify_push"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), binds: Some(vec![ @@ -47,23 +47,23 @@ impl ServiceTrait for NotifyPush { ..Default::default() }), env: Some(vec![ - "NEXTCLOUD_URL=http://cloud/", - "LOG=debug", - "REDIS_URL=redis://cloud/", + "NEXTCLOUD_URL=http://cloud/".into(), + "LOG=debug".into(), + "REDIS_URL=redis://cloud/".into(), ]), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), - cmd: Some(vec!["/notify_push", "/config/config.php"]), + cmd: Some(vec!["/notify_push".into(), "/config/config.php".into()]), ..Default::default() }; let id = docker diff --git a/src/service/redis.rs b/src/service/redis.rs index 1712b9b..29a22ee 100644 --- a/src/service/redis.rs +++ b/src/service/redis.rs @@ -3,8 +3,8 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -29,26 +29,26 @@ impl ServiceTrait for Redis { let image = "redis:8-alpine"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -57,10 +57,7 @@ impl ServiceTrait for Redis { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/sftp.rs b/src/service/sftp.rs index 84502c1..80405e2 100644 --- a/src/service/sftp.rs +++ b/src/service/sftp.rs @@ -3,8 +3,8 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -29,28 +29,28 @@ impl ServiceTrait for Sftp { let image = "atmoz/sftp:alpine"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), - cmd: Some(vec!["test:test:::data"]), + cmd: Some(vec!["test:test:::data".into()]), ..Default::default() }; let id = docker @@ -58,10 +58,7 @@ impl ServiceTrait for Sftp { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) } diff --git a/src/service/smb.rs b/src/service/smb.rs index 5f4dec9..a40b105 100644 --- a/src/service/smb.rs +++ b/src/service/smb.rs @@ -3,8 +3,8 @@ use crate::config::HazeConfig; use crate::image::pull_image; use crate::service::ServiceTrait; use crate::Result; -use bollard::container::{Config, CreateContainerOptions, NetworkingConfig}; -use bollard::models::{EndpointSettings, HostConfig}; +use bollard::models::{ContainerCreateBody, EndpointSettings, HostConfig, NetworkingConfig}; +use bollard::query_parameters::CreateContainerOptions; use bollard::Docker; use maplit::hashmap; use miette::IntoDiagnostic; @@ -29,31 +29,31 @@ impl ServiceTrait for Smb { let image = "ghcr.io/servercontainers/samba:smbd-only-a3.18.0-s4.18.2-r0"; pull_image(docker, image).await?; let options = Some(CreateContainerOptions { - name: self.container_name(cloud_id).unwrap(), + name: self.container_name(cloud_id), ..CreateContainerOptions::default() }); - let config = Config { - image: Some(image), + let config = ContainerCreateBody { + image: Some(image.into()), host_config: Some(HostConfig { network_mode: Some(network.to_string()), ..Default::default() }), env: Some(vec![ - "ACCOUNT_test=test", - "UID_test=1000", - "SAMBA_VOLUME_CONFIG_test=[test]; path=/tmp; valid users = test; guest ok = no; read only = no; browseable = yes", + "ACCOUNT_test=test".into(), + "UID_test=1000".into(), + "SAMBA_VOLUME_CONFIG_test=[test]; path=/tmp; valid users = test; guest ok = no; read only = no; browseable = yes".into(), ]), labels: Some(hashmap! { - "haze-type" => self.name(), - "haze-cloud-id" => cloud_id + "haze-type".into() => self.name().into(), + "haze-cloud-id".into() => cloud_id.into(), }), networking_config: Some(NetworkingConfig { - endpoints_config: hashmap! { - network => EndpointSettings { + endpoints_config: Some(hashmap! { + network.into() => EndpointSettings { aliases: Some(vec![self.name().to_string()]), ..Default::default() } - }, + }), }), ..Default::default() }; @@ -62,10 +62,7 @@ impl ServiceTrait for Smb { .await .into_diagnostic()? .id; - docker - .start_container::(&id, None) - .await - .into_diagnostic()?; + docker.start_container(&id, None).await.into_diagnostic()?; Ok(vec![id]) }