updates

Cargo.toml

@@ -2,17 +2,17 @@
 name = "haze"
 version = "1.6.0"
 authors = ["Robin Appelman <robin@icewind.nl>"]
-edition = "2018"
+edition = "2024"
 repository = "https://github.com/icewind1991/haze"
 license = "MIT"
 description = "Easy setup and management of Nextcloud test instances using docker"
 
 [dependencies]
-bollard = "0.16.1"
+bollard = "0.18.1"
 maplit = "1.0.2"
 camino = { version = "1.1.7", features = ["serde1"] }
 tokio = { version = "1.38.0", features = ["fs", "macros", "signal", "rt-multi-thread"] }
-parse-display = "0.9.1"
+parse-display = "0.10.0"
 futures-util = "0.3.30"
 termion = "4.0.1"
 opener = "0.7.1"
@@ -35,7 +35,7 @@ tracing-subscriber = "0.3.18"
 hyper-reverse-proxy = { version = "0.5.2-dev", git = "https://github.com/felipenoris/hyper-reverse-proxy" }
 hyper = "0.14.29"
 atty = "0.2.14"
-git2 = { version = "0.18.3", default-features = false }
+git2 = { version = "0.20.0", default-features = false }
 
 [profile.release]
 lto = true

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "crane": {
       "locked": {
-        "lastModified": 1733688869,
-        "narHash": "sha256-KrhxxFj1CjESDrL5+u/zsVH0K+Ik9tvoac/oFPoxSB8=",
+        "lastModified": 1739936662,
+        "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "604637106e420ad99907cae401e13ab6b452e7d9",
+        "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7",
         "type": "github"
       },
       "original": {
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739796086,
-        "narHash": "sha256-jxpUiVJ6O+V1YsXsvWdMgqnv8zk9TFiqF86CRdGGGH4=",
+        "lastModified": 1741005720,
+        "narHash": "sha256-zNIvYFBOTGomaxknkZLO/7p6eorwwgvHeatN2YySBPQ=",
         "owner": "nix-community",
         "repo": "flakelight",
-        "rev": "540efca2f9015aff7dc574c7a03404e5fa72d42f",
+        "rev": "f996547e5d142853ab6d619858a605af516d1d67",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1735052218,
-        "narHash": "sha256-I30wh6G8fSUO4EseexxiDXcxyUhXR6C8BvEeKn6xyfE=",
+        "lastModified": 1740783063,
+        "narHash": "sha256-nJ/tvNBWFNJtwtNG/KsqtVq4p3aitkEb1pRW0qHvmsk=",
         "owner": "icewind1991",
         "repo": "mill-scale",
-        "rev": "7e45bb598ff63a8416ee3c26743b20644563bd93",
+        "rev": "591ea924cfd3cd7932b385341fb0aad0a935bb46",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739758141,
-        "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
+        "lastModified": 1740932899,
+        "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
+        "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
         "type": "github"
       },
       "original": {
@@ -88,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733884434,
-        "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=",
+        "lastModified": 1740277845,
+        "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2",
+        "rev": "f933070c29f9c1c5457447a51903f27f76ebb519",
         "type": "github"
       },
       "original": {

src/cloud.rs

@@ -1,14 +1,14 @@
 use crate::config::{HazeConfig, HazeVolumeConfig, Preset};
 use crate::database::Database;
-use crate::exec::{exec, exec_io, exec_tty, ExitCode};
-use crate::mapping::{default_mappings, Mapping};
-use crate::php::{PhpVersion, PHP_MEMORY_LIMIT};
+use crate::exec::{ExitCode, exec, exec_io, exec_tty};
+use crate::mapping::{Mapping, default_mappings};
+use crate::php::{PHP_MEMORY_LIMIT, PhpVersion};
 use crate::service::Service;
 use crate::service::ServiceTrait;
+use bollard::Docker;
 use bollard::container::{ListContainersOptions, RemoveContainerOptions, UpdateContainerOptions};
 use bollard::models::ContainerState;
 use bollard::network::CreateNetworkOptions;
-use bollard::Docker;
 use camino::Utf8PathBuf;
 use flate2::read::GzDecoder;
 use futures_util::future::try_join_all;
@@ -18,7 +18,7 @@ use serde_json::Value;
 use std::collections::HashMap;
 use std::fmt::Display;
 use std::fs;
-use std::io::{stdout, Cursor, Read, Stdout, Write};
+use std::io::{Cursor, Read, Stdout, Write, stdout};
 use std::iter::Peekable;
 use std::net::IpAddr;
 use std::os::unix::fs::MetadataExt;
@@ -254,9 +254,7 @@ impl Cloud {
             })
             .await
             .into_diagnostic()?
-            .id
-            .ok_or_else(|| Report::msg("No network id in response"))
-            .wrap_err("Failed to create network")?;
+            .id;
 
         let network_info = docker
             .inspect_network::<String>(&network, None)

src/network.rs

@@ -46,7 +46,6 @@ pub async fn ensure_network_exists(docker: &Docker, name: &str) -> Result<String
             })
             .await
             .into_diagnostic()?
-            .id
-            .unwrap())
+            .id)
     }
 }