diff --git a/ADOPTERS.md b/ADOPTERS.md index 3cf573bad5b..9ff35f0f711 100644 --- a/ADOPTERS.md +++ b/ADOPTERS.md @@ -23,7 +23,7 @@ visit [VKE](https://www.volcengine.com/product/vke) & [CR](https://www.volcengin [Container Registry](https://www.alibabacloud.com/product/container-registry), refer to [Use P2P Acceleration in ACK](https://www.alibabacloud.com/help/en/container-registry/latest/use-the-p2p-acceleration-feature-in-ask-and-ack-clusters). **Recommend to deploy the more efficient and stable -[Dragonfly 2.0](https://github.com/dragonflyoss/Dragonfly2)**, +[Dragonfly 2.0](https://github.com/dragonflyoss/dragonfly)**, refer to [Setup Dragonfly in Kubernetes](https://d7y.io/docs/getting-started/quick-start/kubernetes/). ### Organizations diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4587d6e7eb2..325405d676e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ Instead, we encourage you to send us a private email to To be honest, we regard every user of Dragonfly as a very kind contributor. After experiencing Dragonfly, you may have some feedback for the project. Then feel free to open an issue via -[NEW ISSUE](https://github.com/dragonflyoss/Dragonfly2/issues/new). +[NEW ISSUE](https://github.com/dragonflyoss/dragonfly/issues/new). Since we collaborate project Dragonfly in a distributed way, we appreciate **WELL-WRITTEN**, **DETAILED**, **EXPLICIT** issue reports. @@ -99,63 +99,63 @@ the preparation in the following steps: 1. **FORK** Dragonfly to your repository. - To make this work, you just need to click the button Fork - in right-left of [dragonflyoss/Dragonfly2](https://github.com/dragonflyoss/Dragonfly2) - main page. Then you will end up with your repository in - `https://github.com//Dragonfly`, - in which `your-username` is your GitHub username. +To make this work, you just need to click the button Fork +in right-left of [dragonflyoss/dragonfly](https://github.com/dragonflyoss/dragonfly) +main page. Then you will end up with your repository in +`https://github.com//Dragonfly`, +in which `your-username` is your GitHub username. 1. **CLONE** your own repository to develop locally. - Use `git clone https://github.com//Dragonfly2.git` - to clone repository to your local machine. - Then you can create new branches to finish the change you wish to make. +Use `git clone https://github.com//dragonfly.git` +to clone repository to your local machine. +Then you can create new branches to finish the change you wish to make. 1. **Set Remote** upstream to be - `https://github.com/dragonflyoss/Dragonfly2.git` + `https://github.com/dragonflyoss/dragonfly.git` - using the following two commands: +using the following two commands: - ```bash - git remote add upstream https://github.com/dragonflyoss/Dragonfly2.git - git remote set-url --push upstream no-pushing - ``` +```bash +git remote add upstream https://github.com/dragonflyoss/dragonfly.git +git remote set-url --push upstream no-pushing +``` - With this remote setting, you can check your git remote configuration like this: +With this remote setting, you can check your git remote configuration like this: - ```bash - $ git remote -v - origin https://github.com//Dragonfly2.git (fetch) - origin https://github.com//Dragonfly2.git (push) - upstream https://github.com/dragonflyoss/Dragonfly2.git (fetch) - upstream no-pushing (push) - ``` +```bash +$ git remote -v +origin https://github.com//dragonfly.git (fetch) +origin https://github.com//dragonfly.git (push) +upstream https://github.com/dragonflyoss/dragonfly.git (fetch) +upstream no-pushing (push) +``` - Adding this, we can easily synchronize local branches with upstream branches. +Adding this, we can easily synchronize local branches with upstream branches. 1. **Create a branch** to add a new feature or fix issues - Update local working directory: +Update local working directory: - ```bash - cd Dragonfly2 - git fetch upstream - git checkout main - git rebase upstream/main - ``` +```bash +cd dragonfly +git fetch upstream +git checkout main +git rebase upstream/main +``` - Create a new branch: +Create a new branch: - ```bash - git checkout -b - ``` +```bash +git checkout -b +``` - Make any change on the `new-branch` then build and test your codes. +Make any change on the `new-branch` then build and test your codes. ### Branch Definition Right now we assume every contribution via pull -request is for [branch main](https://github.com/dragonflyoss/Dragonfly2/tree/main) +request is for [branch main](https://github.com/dragonflyoss/dragonfly/tree/main) in Dragonfly. Before contributing, be aware of branch definition would help a lot. @@ -320,5 +320,5 @@ willing to participate in Dragonfly community continuously and be active. You can do it in either of two ways: - Submit a PR in the - [dragonflyoss/Dragonfly2](https://github.com/dragonflyoss/Dragonfly2) repo. + [dragonflyoss/dragonfly](https://github.com/dragonflyoss/dragonfly) repo. - Contact with the community's [maintainers](MAINTAINERS.md) offline. diff --git a/README.md b/README.md index 7adf12fda0d..e8694021ffa 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,14 @@ ![alt][logo-linear] -[![GitHub release](https://img.shields.io/github/release/dragonflyoss/Dragonfly2.svg)](https://github.com/dragonflyoss/Dragonfly2/releases) +[![GitHub release](https://img.shields.io/github/release/dragonflyoss/dragonfly.svg)](https://github.com/dragonflyoss/dragonfly/releases) [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/dragonfly)](https://artifacthub.io/packages/search?repo=dragonfly) -[![CI](https://github.com/dragonflyoss/Dragonfly2/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/dragonflyoss/Dragonfly2/actions/workflows/ci.yml) -[![Coverage](https://codecov.io/gh/dragonflyoss/Dragonfly2/branch/main/graph/badge.svg)](https://codecov.io/gh/dragonflyoss/Dragonfly2) -[![Go Report Card](https://goreportcard.com/badge/github.com/dragonflyoss/Dragonfly2?style=flat-square)](https://goreportcard.com/report/github.com/dragonflyoss/Dragonfly2) -[![Open Source Helpers](https://www.codetriage.com/dragonflyoss/dragonfly2/badges/users.svg)](https://www.codetriage.com/dragonflyoss/dragonfly2) -[![TODOs](https://badgen.net/https/api.tickgit.com/badgen/github.com/dragonflyoss/Dragonfly2/main)](https://www.tickgit.com/browse?repo=github.com/dragonflyoss/Dragonfly2&branch=main) -[![Discussions](https://img.shields.io/badge/discussions-on%20github-blue?style=flat-square)](https://github.com/dragonflyoss/Dragonfly2/discussions) +[![CI](https://github.com/dragonflyoss/dragonfly/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/dragonflyoss/dragonfly/actions/workflows/ci.yml) +[![Go Report Card](https://goreportcard.com/badge/github.com/dragonflyoss/dragonfly?style=flat-square)](https://goreportcard.com/report/github.com/dragonflyoss/dragonfly) +[![Discussions](https://img.shields.io/badge/discussions-on%20github-blue?style=flat-square)](https://github.com/dragonflyoss/dragonfly/discussions) [![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Fdragonfly_oss)](https://twitter.com/dragonfly_oss) -[![GoDoc](https://godoc.org/github.com/dragonflyoss/Dragonfly2?status.svg)](https://godoc.org/github.com/dragonflyoss/Dragonfly2) [![OpenSSF Best Practices](https://bestpractices.coreinfrastructure.org/projects/7103/badge)](https://bestpractices.coreinfrastructure.org/projects/7103) -[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/dragonflyoss/Dragonfly2/badge)](https://scorecard.dev/viewer/?uri=github.com/dragonflyoss/Dragonfly2) -[![LICENSE](https://img.shields.io/github/license/dragonflyoss/Dragonfly2.svg?style=flat-square)](https://github.com/dragonflyoss/Dragonfly2/blob/main/LICENSE) +[![LICENSE](https://img.shields.io/github/license/dragonflyoss/dragonfly.svg?style=flat-square)](https://github.com/dragonflyoss/dragonfly/blob/main/LICENSE) Provide efficient, stable and secure file distribution and image acceleration based on p2p technology to be the best practice and @@ -83,7 +78,7 @@ Please refer to our [Code of Conduct][codeconduct]. [arch]: docs/images/arch.png [logo-linear]: docs/images/logo/dragonfly-linear.svg -[discussion]: https://github.com/dragonflyoss/Dragonfly2/discussions +[discussion]: https://github.com/dragonflyoss/dragonfly/discussions [contributing]: CONTRIBUTING.md [codeconduct]: CODE_OF_CONDUCT.md [d7y.io]: https://d7y.io/ diff --git a/build/images/base/README.md b/build/images/base/README.md index d48e8086051..e1ce885004e 100644 --- a/build/images/base/README.md +++ b/build/images/base/README.md @@ -41,7 +41,7 @@ make docker-build ```shell COMMIT_ID=c1c3d652 mkdir -p /go/src/d7y.io/dragonfly -git clone https://github.com/dragonflyoss/Dragonfly2.git /go/src/d7y.io/dragonfly/v2 +git clone https://github.com/dragonflyoss/dragonfly.git /go/src/d7y.io/dragonfly/v2 git reset --hard ${COMMIT_ID} ``` diff --git a/build/package/docs/dfcache/dfcache.1 b/build/package/docs/dfcache/dfcache.1 index 46d840df2f8..c593ec5ea86 100644 --- a/build/package/docs/dfcache/dfcache.1 +++ b/build/package/docs/dfcache/dfcache.1 @@ -56,4 +56,4 @@ dfcache stat - stat checks if a file exists in P2P cache system dfcache version - show version .SH BUGS .PP -See GitHub Issues: +See GitHub Issues: diff --git a/build/package/docs/dfcache/dfcache.md b/build/package/docs/dfcache/dfcache.md index 1e7cb73787c..c92c29522a6 100644 --- a/build/package/docs/dfcache/dfcache.md +++ b/build/package/docs/dfcache/dfcache.md @@ -45,4 +45,4 @@ responsibility to go back to source and add file into P2P network. # BUGS -See GitHub Issues: +See GitHub Issues: diff --git a/build/package/docs/dfget.1 b/build/package/docs/dfget.1 index 1b1dc9235b1..7e5696dcf82 100644 --- a/build/package/docs/dfget.1 +++ b/build/package/docs/dfget.1 @@ -53,4 +53,4 @@ and so on. .fi .SH BUGS .PP -See GitHub Issues: +See GitHub Issues: diff --git a/build/package/docs/dfget.1.md b/build/package/docs/dfget.1.md index c2ad0bce219..25a4dafc0fa 100644 --- a/build/package/docs/dfget.1.md +++ b/build/package/docs/dfget.1.md @@ -46,4 +46,4 @@ functionality, such as network bandwidth limit, transmission encryption and so o # BUGS -See GitHub Issues: +See GitHub Issues: diff --git a/build/package/docs/dfstore/dfstore.1 b/build/package/docs/dfstore/dfstore.1 index 0411d5b6e56..2602e334f96 100644 --- a/build/package/docs/dfstore/dfstore.1 +++ b/build/package/docs/dfstore/dfstore.1 @@ -31,4 +31,4 @@ dfcache remove - remove object from P2P storage system dfcache version - show version .SH BUGS .PP -See GitHub Issues: +See GitHub Issues: diff --git a/build/package/docs/dfstore/dfstore.md b/build/package/docs/dfstore/dfstore.md index aa102bec740..31607c441d0 100644 --- a/build/package/docs/dfstore/dfstore.md +++ b/build/package/docs/dfstore/dfstore.md @@ -26,4 +26,4 @@ In the process of object storage, P2P Cache is effectively used for fast read an # BUGS -See GitHub Issues: +See GitHub Issues: diff --git a/client/daemon/transport/transport.go b/client/daemon/transport/transport.go index 00ceac492ce..9b93dfcbc22 100644 --- a/client/daemon/transport/transport.go +++ b/client/daemon/transport/transport.go @@ -525,7 +525,7 @@ var hopHeaders = []string{ "Upgrade", // remove by dragonfly - // "Accept", Accept header should not be removed, issue: https://github.com/dragonflyoss/Dragonfly2/issues/1290 + // "Accept", Accept header should not be removed, issue: https://github.com/dragonflyoss/dragonfly/issues/1290 "User-Agent", "X-Forwarded-For", } diff --git a/pkg/net/ip/ipv4.go b/pkg/net/ip/ipv4.go index e4e6dc748c8..d34db9dac07 100644 --- a/pkg/net/ip/ipv4.go +++ b/pkg/net/ip/ipv4.go @@ -63,7 +63,7 @@ func externalIPv4() (net.IP, error) { } // ipAddrs returns all the valid IPs available. -// refer to https://github.com/dragonflyoss/Dragonfly2/pull/652 +// refer to https://github.com/dragonflyoss/dragonfly/pull/652 func ipAddrs() ([]net.IP, error) { // use prefer ip possible var prefers []net.IP