Skip to content

Commit

Permalink
Merge branch 'dragonflyoss:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
taoohong authored Mar 24, 2023
2 parents 3a09d07 + 14c709d commit 14f45af
Show file tree
Hide file tree
Showing 94 changed files with 7,781 additions and 6,744 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Smoke Test

on:
push:
branches: ["*"]
branches: ["*", "**"]
paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ]
pull_request:
branches: ["*"]
branches: ["*", "**"]
paths-ignore: [ '**.md', '**.png', '**.jpg', '**.svg', '**/docs/**' ]
schedule:
# Run daily sanity check at 03:00 clock UTC
Expand Down
14 changes: 14 additions & 0 deletions ADOPTERS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## CNCF Dragonfly Nydus Adopters

A non-exhaustive list of containerd adopters is provided below.
Please kindly share your experience about Nydus with us and help us to improve Nydus ❤️.

**_[Alibaba Cloud](https://www.alibabacloud.com)_** - Aliyun serverless image pull time drops from 20 seconds to 0.8s seconds.

**_[Ant Group](https://www.antgroup.com)_** - Serving large-scale clusters with millions of container creations each day.

**_[ByteDance](https://www.bytedance.com)_** - Serving container image acceleration in Technical Infrastructure of ByteDance.

**_[KuaiShou](https://www.kuaishou.com)_** - Starting to deploy millions of containers with Dragonfly and Nydus.

**_[Yue Miao](https://www.laiyuemiao.com)_** - The startup time of micro service has been greatly improved, and reduced the network consumption.
122 changes: 92 additions & 30 deletions Cargo.lock

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

19 changes: 12 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ authors = ["The Nydus Developers"]
license = "Apache-2.0 OR BSD-3-Clause"
homepage = "https://nydus.dev/"
repository = "https://github.com/dragonflyoss/image-service"
exclude = ["contrib/", "smoke/", "tests/"]
edition = "2018"
resolver = "2"

Expand All @@ -31,13 +32,11 @@ path = "src/lib.rs"

[dependencies]
anyhow = "1"
base64 = "0.13.0"
clap = { version = "4.0.18", features = ["derive", "cargo"] }
fuse-backend-rs = "0.10.1"
hex = "0.4.3"
hyper = "0.14.11"
hyperlocal = "0.8.0"
indexmap = "1"
lazy_static = "1"
libc = "0.2"
log = "0.4.8"
Expand All @@ -46,21 +45,18 @@ nix = "0.24.0"
rlimit = "0.9.0"
serde = { version = "1.0.110", features = ["serde_derive", "rc"] }
serde_json = "1.0.51"
sha2 = "0.10.2"
tar = "0.4.38"
tokio = { version = "1.24", features = ["macros"] }
vmm-sys-util = "0.10.0"
xattr = "0.2.3"

# Build static linked openssl library
openssl = { version = "0.10.45", features = ["vendored"] }
# pin openssl-src to bring in fix for https://rustsec.org/advisories/RUSTSEC-2022-0032
#openssl-src = { version = "111.22" }

nydus-api = { version = "0.2.1", path = "api", features = ["handler"] }
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" }
nydus-rafs = { version = "0.2.2", path = "rafs", features = ["builder"] }
nydus-service = { version = "0.2.0", path = "service" }
nydus-storage = { version = "0.6.2", path = "storage" }
nydus-utils = { version = "0.4.1", path = "utils" }
Expand All @@ -70,6 +66,11 @@ vhost-user-backend = { version = "0.7.0", optional = true }
virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"], optional = true }
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 }

[dev-dependencies]
xattr = "0.2.3"
vmm-sys-util = "0.10.0"

[features]
default = [
Expand All @@ -87,6 +88,10 @@ virtiofs = [
"virtio-bindings",
"virtio-queue",
"vm-memory",
"vmm-sys-util",
]
block-nbd = [
"nydus-service/block-nbd"
]

backend-http-proxy = ["nydus-storage/backend-http-proxy"]
Expand Down
Loading

0 comments on commit 14f45af

Please sign in to comment.