Skip to content

Commit

Permalink
api: merge crate nydus-app into crate nydus
Browse files Browse the repository at this point in the history
Merge crate nydus-app into crate nydus, to reduce number of crates.

Signed-off-by: Jiang Liu <[email protected]>
  • Loading branch information
jiangliu authored and liubogithub committed May 18, 2023
1 parent faa4116 commit d751679
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 399 deletions.
20 changes: 3 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ repository = "https://github.com/dragonflyoss/image-service"
exclude = ["contrib/", "smoke/", "tests/"]
edition = "2018"
resolver = "2"
build = "build.rs"

[profile.release]
panic = "abort"
Expand All @@ -33,13 +34,15 @@ path = "src/lib.rs"
[dependencies]
anyhow = "1"
clap = { version = "4.0.18", features = ["derive", "cargo"] }
flexi_logger = { version = "0.25", features = ["compress"] }
fuse-backend-rs = "0.10.1"
hex = "0.4.3"
hyper = "0.14.11"
hyperlocal = "0.8.0"
lazy_static = "1"
libc = "0.2"
log = "0.4.8"
log-panics = { version = "2.1.0", features = ["with-backtrace"] }
mio = { version = "0.8", features = ["os-poll", "os-ext"] }
nix = "0.24.0"
rlimit = "0.9.0"
Expand All @@ -54,7 +57,6 @@ openssl = { version = "0.10.48", features = ["vendored"] }
#openssl-src = { version = "111.22" }

nydus-api = { version = "0.2.2", path = "api", features = ["handler"] }
nydus-app = { version = "0.3.2", path = "app" }
nydus-error = { version = "0.2.3", path = "error" }
nydus-rafs = { version = "0.2.2", path = "rafs", features = ["builder"] }
nydus-service = { version = "0.2.0", path = "service", features = ["block-device"] }
Expand All @@ -68,6 +70,9 @@ virtio-queue = { version = "0.6.0", optional = true }
vm-memory = { version = "0.9.0", features = ["backend-mmap"], optional = true }
vmm-sys-util = { version = "0.10.0", optional = true }

[build-dependencies]
time = { version = "0.3.14", features = ["formatting"] }

[dev-dependencies]
xattr = "0.2.3"
vmm-sys-util = "0.10.0"
Expand Down Expand Up @@ -101,4 +106,4 @@ backend-registry = ["nydus-storage/backend-registry"]
backend-s3 = ["nydus-storage/backend-s3"]

[workspace]
members = ["api", "app", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
members = ["api", "blobfs", "clib", "error", "rafs", "storage", "service", "utils"]
14 changes: 0 additions & 14 deletions app/CHANGELOG.md

This file was deleted.

1 change: 0 additions & 1 deletion app/CODEOWNERS

This file was deleted.

24 changes: 0 additions & 24 deletions app/Cargo.toml

This file was deleted.

202 changes: 0 additions & 202 deletions app/LICENSE

This file was deleted.

Loading

0 comments on commit d751679

Please sign in to comment.