robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 09:04:12 +02:00
Code Issues Projects Releases Wiki Activity

updates

Browse source
This commit is contained in:
Robin Appelman 2024-06-12 14:54:32 +02:00
commit 33d2e66811
5 changed files with 605 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

937
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

28
Cargo.toml
View file

@ -10,21 +10,21 @@ description = "Easy setup and management of Nextcloud test instances using docke
[dependencies] [dependencies]
bollard = "0.16.1" bollard = "0.16.1"
maplit = "1.0.2" maplit = "1.0.2"
camino = { version = "1.1.6", features = ["serde1"] } camino = { version = "1.1.7", features = ["serde1"] }
tokio = { version = "1.36.0", features = ["fs", "macros", "signal", "rt-multi-thread"] } tokio = { version = "1.38.0", features = ["fs", "macros", "signal", "rt-multi-thread"] }
parse-display = "0.9.0" parse-display = "0.9.1"
futures-util = "0.3.30" futures-util = "0.3.30"
termion = "3.0.0" termion = "4.0.1"
opener = "0.7.0" opener = "0.7.1"
toml = "0.8.12" toml = "0.8.14"
directories-next = "2.0.0" directories-next = "2.0.0"
serde = "1.0.197" serde = "1.0.203"
petname = "1.1.3" petname = "2.0.2"
reqwest = { version = "0.12.2", default-features = false } reqwest = { version = "0.12.4", default-features = false }
tar = "0.4.40" tar = "0.4.41"
flate2 = "1.0.28" flate2 = "1.0.30"
async-trait = "0.1.79" async-trait = "0.1.80"
enum_dispatch = "0.3.12" enum_dispatch = "0.3.13"
miette = { version = "7.2.0", features = ["fancy"] } miette = { version = "7.2.0", features = ["fancy"] }
shell-words = "1.1.0" shell-words = "1.1.0"
warp = "0.3" warp = "0.3"
@ -32,7 +32,7 @@ tokio-stream = { version = "0.1.15", features = ["net"] }
tracing = "0.1.40" tracing = "0.1.40"
tracing-subscriber = "0.3.18" tracing-subscriber = "0.3.18"
hyper-reverse-proxy = { version = "0.5.2-dev", git = "https://github.com/felipenoris/hyper-reverse-proxy" } hyper-reverse-proxy = { version = "0.5.2-dev", git = "https://github.com/felipenoris/hyper-reverse-proxy" }
hyper = "0.14.28" hyper = "0.14.29"
atty = "0.2.14" atty = "0.2.14"
git2 = { version = "0.18.3", default-features = false } git2 = { version = "0.18.3", default-features = false }

32
flake.lock generated
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705943642, "lastModified": 1717704286,
"narHash": "sha256-M/n8k0Ato/WGmNJjtIUQGoooVBXL1ahSveiCK772Dk8=", "narHash": "sha256-zrLB/FTKODEAlJjgO8TwbK7teTseYbjLESp8QJ/FJYc=",
"owner": "icewind1991", "owner": "icewind1991",
"repo": "cross-naersk", "repo": "cross-naersk",
"rev": "db45d5a45b69d7d246bc748a54cd3cbbd9c47e74", "rev": "9068daceb8f0d248dcf629944f60e92b81391bdb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -28,11 +28,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1698420672, "lastModified": 1717067539,
"narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "narHash": "sha256-oIs5EF+6VpHJRvvpVWuqCYJMMVW/6h59aYUv9lABLtY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "aeb58d5e8faead8980a807c840232697982d47b9", "rev": "fa19d8c135e776dc97f4dcca08656a0eeb28d5c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,16 +63,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1707978831, "lastModified": 1718086528,
"narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=", "narHash": "sha256-hoB7B7oPgypePz16cKWawPfhVvMSXj4G/qLsfFuhFjw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da", "rev": "47b604b07d1e8146d5398b42d3306fdebd343986",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -95,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708049456, "lastModified": 1718158726,
"narHash": "sha256-8qGWZTQPPBhcF5dsl1KSWF+H7RX8C3BZGvqYWKBtLjQ=", "narHash": "sha256-nOt0XxRZ9ZwztX4OOKdS4YkPd3TVfz/PoaD8TiT7/vw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "4ee92bf124fbc4e157cbce1bc2a35499866989fc", "rev": "d4d933340cd3b35d3dc256d76abc3d510e21dfdc",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-24.05";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
naersk.url = "github:nix-community/naersk"; naersk.url = "github:nix-community/naersk";
naersk.inputs.nixpkgs.follows = "nixpkgs"; naersk.inputs.nixpkgs.follows = "nixpkgs";

2
src/cloud.rs
View file

@ -192,7 +192,7 @@ impl Cloud {
let id = options let id = options
.name .name
.map(|name| format!("haze-{}", name)) .map(|name| format!("haze-{}", name))
.unwrap_or_else(|| format!("haze-{}", petname(2, "-"))); .unwrap_or_else(|| format!("haze-{}", petname(2, "-").unwrap()));
let workdir = config.work_dir.join(&id); let workdir = config.work_dir.join(&id);
let app_package_dir = workdir.join("app_package"); let app_package_dir = workdir.join("app_package");