From 69dfd01194b30466d686dba7c7bbec7c999e3969 Mon Sep 17 00:00:00 2001 From: Yadong Ding Date: Fri, 15 Dec 2023 14:32:42 +0800 Subject: [PATCH 1/2] chore: change go module name to nydus Signed-off-by: Yadong Ding --- contrib/ctr-remote/cmd/main.go | 2 +- contrib/ctr-remote/go.mod | 2 +- contrib/nydus-overlayfs/go.mod | 2 +- contrib/nydusify/cmd/nydusify.go | 18 +++++++++--------- contrib/nydusify/examples/converter/main.go | 2 +- contrib/nydusify/go.mod | 2 +- contrib/nydusify/pkg/backend/backend.go | 4 ++-- contrib/nydusify/pkg/backend/registry.go | 2 +- contrib/nydusify/pkg/cache/cache.go | 6 +++--- contrib/nydusify/pkg/cache/cache_test.go | 4 ++-- contrib/nydusify/pkg/checker/checker.go | 12 ++++++------ contrib/nydusify/pkg/checker/output.go | 4 ++-- contrib/nydusify/pkg/checker/rule/bootstrap.go | 4 ++-- .../nydusify/pkg/checker/rule/filesystem.go | 8 ++++---- contrib/nydusify/pkg/checker/rule/manifest.go | 4 ++-- .../nydusify/pkg/checker/rule/manifest_test.go | 2 +- .../pkg/chunkdict/generator/generator.go | 8 ++++---- .../nydusify/pkg/chunkdict/generator/output.go | 4 ++-- contrib/nydusify/pkg/compactor/compactor.go | 2 +- contrib/nydusify/pkg/converter/converter.go | 2 +- contrib/nydusify/pkg/copier/copier.go | 10 +++++----- .../pkg/metrics/fileexporter/fileexporter.go | 2 +- contrib/nydusify/pkg/packer/artifact.go | 2 +- contrib/nydusify/pkg/packer/backend.go | 2 +- contrib/nydusify/pkg/packer/packer.go | 6 +++--- contrib/nydusify/pkg/packer/packer_test.go | 2 +- contrib/nydusify/pkg/packer/pusher.go | 4 ++-- contrib/nydusify/pkg/packer/pusher_test.go | 2 +- contrib/nydusify/pkg/parser/parser.go | 4 ++-- contrib/nydusify/pkg/provider/remote.go | 2 +- contrib/nydusify/pkg/provider/source.go | 6 +++--- contrib/nydusify/pkg/viewer/viewer.go | 8 ++++---- contrib/nydusify/plugin/main.go | 2 +- smoke/go.mod | 2 +- smoke/tests/api_test.go | 6 +++--- smoke/tests/benchmark_test.go | 4 ++-- smoke/tests/blobcache_test.go | 6 +++--- smoke/tests/compatibility_test.go | 4 ++-- smoke/tests/image_test.go | 4 ++-- smoke/tests/main_test.go | 2 +- smoke/tests/native_layer_test.go | 6 +++--- smoke/tests/performance_test.go | 4 ++-- smoke/tests/texture/layer.go | 2 +- smoke/tests/tool/iterator.go | 2 +- smoke/tests/zran_layer_test.go | 6 +++--- 45 files changed, 97 insertions(+), 97 deletions(-) diff --git a/contrib/ctr-remote/cmd/main.go b/contrib/ctr-remote/cmd/main.go index e6e6d76ddc3..4721e3122a5 100644 --- a/contrib/ctr-remote/cmd/main.go +++ b/contrib/ctr-remote/cmd/main.go @@ -22,7 +22,7 @@ import ( "github.com/containerd/containerd/cmd/ctr/app" "github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies - "github.com/dragonflyoss/image-service/contrib/ctr-remote/commands" + "github.com/dragonflyoss/nydus/contrib/ctr-remote/commands" "github.com/urfave/cli" ) diff --git a/contrib/ctr-remote/go.mod b/contrib/ctr-remote/go.mod index a0526fc5e46..e7e57cf066c 100644 --- a/contrib/ctr-remote/go.mod +++ b/contrib/ctr-remote/go.mod @@ -1,4 +1,4 @@ -module github.com/dragonflyoss/image-service/contrib/ctr-remote +module github.com/dragonflyoss/nydus/contrib/ctr-remote go 1.20 diff --git a/contrib/nydus-overlayfs/go.mod b/contrib/nydus-overlayfs/go.mod index dcc458a466d..df0e0070949 100644 --- a/contrib/nydus-overlayfs/go.mod +++ b/contrib/nydus-overlayfs/go.mod @@ -1,4 +1,4 @@ -module github.com/dragonflyoss/image-service/contrib/nydus-overlayfs +module github.com/dragonflyoss/nydus/contrib/nydus-overlayfs go 1.20 diff --git a/contrib/nydusify/cmd/nydusify.go b/contrib/nydusify/cmd/nydusify.go index 53cf1bc39da..517a6588529 100644 --- a/contrib/nydusify/cmd/nydusify.go +++ b/contrib/nydusify/cmd/nydusify.go @@ -23,15 +23,15 @@ import ( "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/rule" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/chunkdict/generator" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/copier" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/packer" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/viewer" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/rule" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/chunkdict/generator" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/copier" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/packer" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/viewer" ) var ( diff --git a/contrib/nydusify/examples/converter/main.go b/contrib/nydusify/examples/converter/main.go index bbb71e178d5..d9f9bd654ed 100644 --- a/contrib/nydusify/examples/converter/main.go +++ b/contrib/nydusify/examples/converter/main.go @@ -3,7 +3,7 @@ package main import ( "context" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter" ) func main() { diff --git a/contrib/nydusify/go.mod b/contrib/nydusify/go.mod index 7841ebf27db..a5042188885 100644 --- a/contrib/nydusify/go.mod +++ b/contrib/nydusify/go.mod @@ -1,4 +1,4 @@ -module github.com/dragonflyoss/image-service/contrib/nydusify +module github.com/dragonflyoss/nydus/contrib/nydusify go 1.20 diff --git a/contrib/nydusify/pkg/backend/backend.go b/contrib/nydusify/pkg/backend/backend.go index 73c35078996..74df616bc9f 100644 --- a/contrib/nydusify/pkg/backend/backend.go +++ b/contrib/nydusify/pkg/backend/backend.go @@ -9,8 +9,8 @@ import ( "fmt" "io" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/contrib/nydusify/pkg/backend/registry.go b/contrib/nydusify/pkg/backend/registry.go index d3d6c1e01a9..7853fe5a47c 100644 --- a/contrib/nydusify/pkg/backend/registry.go +++ b/contrib/nydusify/pkg/backend/registry.go @@ -5,7 +5,7 @@ import ( "io" "os" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" ) diff --git a/contrib/nydusify/pkg/cache/cache.go b/contrib/nydusify/pkg/cache/cache.go index ea90b1550e6..445442b5b87 100644 --- a/contrib/nydusify/pkg/cache/cache.go +++ b/contrib/nydusify/pkg/cache/cache.go @@ -12,9 +12,9 @@ import ( "io" "strconv" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" "github.com/sirupsen/logrus" "github.com/containerd/containerd/images" diff --git a/contrib/nydusify/pkg/cache/cache_test.go b/contrib/nydusify/pkg/cache/cache_test.go index a45eb6a263a..1f97ff6ed5a 100644 --- a/contrib/nydusify/pkg/cache/cache_test.go +++ b/contrib/nydusify/pkg/cache/cache_test.go @@ -13,8 +13,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) func makeRecord(id int64, hashBlob bool) *Record { diff --git a/contrib/nydusify/pkg/checker/checker.go b/contrib/nydusify/pkg/checker/checker.go index aa72cbc638b..f8d81a40c11 100644 --- a/contrib/nydusify/pkg/checker/checker.go +++ b/contrib/nydusify/pkg/checker/checker.go @@ -12,12 +12,12 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/rule" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/rule" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) // Opt defines Checker options. diff --git a/contrib/nydusify/pkg/checker/output.go b/contrib/nydusify/pkg/checker/output.go index f1446297fc2..a9678a008c4 100644 --- a/contrib/nydusify/pkg/checker/output.go +++ b/contrib/nydusify/pkg/checker/output.go @@ -13,8 +13,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) func prettyDump(obj interface{}, name string) error { diff --git a/contrib/nydusify/pkg/checker/rule/bootstrap.go b/contrib/nydusify/pkg/checker/rule/bootstrap.go index 6316a566d88..5adbeab543c 100644 --- a/contrib/nydusify/pkg/checker/rule/bootstrap.go +++ b/contrib/nydusify/pkg/checker/rule/bootstrap.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" ) // BootstrapRule validates bootstrap in Nydus image diff --git a/contrib/nydusify/pkg/checker/rule/filesystem.go b/contrib/nydusify/pkg/checker/rule/filesystem.go index c08db124db0..1bb881b7ce0 100644 --- a/contrib/nydusify/pkg/checker/rule/filesystem.go +++ b/contrib/nydusify/pkg/checker/rule/filesystem.go @@ -18,10 +18,10 @@ import ( "github.com/distribution/reference" dockerconfig "github.com/docker/cli/cli/config" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" "github.com/pkg/errors" "github.com/pkg/xattr" "github.com/sirupsen/logrus" diff --git a/contrib/nydusify/pkg/checker/rule/manifest.go b/contrib/nydusify/pkg/checker/rule/manifest.go index 0e121016aa3..cb3c96f2763 100644 --- a/contrib/nydusify/pkg/checker/rule/manifest.go +++ b/contrib/nydusify/pkg/checker/rule/manifest.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) // ManifestRule validates manifest format of Nydus image diff --git a/contrib/nydusify/pkg/checker/rule/manifest_test.go b/contrib/nydusify/pkg/checker/rule/manifest_test.go index 1fa209966a3..9a634e7b528 100644 --- a/contrib/nydusify/pkg/checker/rule/manifest_test.go +++ b/contrib/nydusify/pkg/checker/rule/manifest_test.go @@ -3,7 +3,7 @@ package rule import ( "testing" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" "github.com/stretchr/testify/assert" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/nydusify/pkg/chunkdict/generator/generator.go b/contrib/nydusify/pkg/chunkdict/generator/generator.go index e9bcb4ae6b5..c9472c459cc 100644 --- a/contrib/nydusify/pkg/chunkdict/generator/generator.go +++ b/contrib/nydusify/pkg/chunkdict/generator/generator.go @@ -10,10 +10,10 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) // Opt defines Chunkdict generate options. diff --git a/contrib/nydusify/pkg/chunkdict/generator/output.go b/contrib/nydusify/pkg/chunkdict/generator/output.go index 89410f36a65..1a1364c61c7 100644 --- a/contrib/nydusify/pkg/chunkdict/generator/output.go +++ b/contrib/nydusify/pkg/chunkdict/generator/output.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) func prettyDump(obj interface{}, name string) error { diff --git a/contrib/nydusify/pkg/compactor/compactor.go b/contrib/nydusify/pkg/compactor/compactor.go index 29fdecbc974..b833ad7ed0a 100644 --- a/contrib/nydusify/pkg/compactor/compactor.go +++ b/contrib/nydusify/pkg/compactor/compactor.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build" "github.com/pkg/errors" ) diff --git a/contrib/nydusify/pkg/converter/converter.go b/contrib/nydusify/pkg/converter/converter.go index 198e581ffa9..25763fd5019 100644 --- a/contrib/nydusify/pkg/converter/converter.go +++ b/contrib/nydusify/pkg/converter/converter.go @@ -9,7 +9,7 @@ import ( "os" "github.com/containerd/containerd/namespaces" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter/provider" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider" "github.com/goharbor/acceleration-service/pkg/converter" "github.com/goharbor/acceleration-service/pkg/platformutil" "github.com/pkg/errors" diff --git a/contrib/nydusify/pkg/copier/copier.go b/contrib/nydusify/pkg/copier/copier.go index 4cec23ddea3..fa3d059035c 100644 --- a/contrib/nydusify/pkg/copier/copier.go +++ b/contrib/nydusify/pkg/copier/copier.go @@ -20,11 +20,11 @@ import ( "github.com/containerd/containerd/platforms" "github.com/containerd/containerd/reference/docker" "github.com/containerd/nydus-snapshotter/pkg/converter" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/converter/provider" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - nydusifyUtils "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter/provider" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + nydusifyUtils "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" "github.com/dustin/go-humanize" "github.com/goharbor/acceleration-service/pkg/errdefs" "github.com/goharbor/acceleration-service/pkg/platformutil" diff --git a/contrib/nydusify/pkg/metrics/fileexporter/fileexporter.go b/contrib/nydusify/pkg/metrics/fileexporter/fileexporter.go index 2940308f0ad..1f661971cc9 100644 --- a/contrib/nydusify/pkg/metrics/fileexporter/fileexporter.go +++ b/contrib/nydusify/pkg/metrics/fileexporter/fileexporter.go @@ -7,7 +7,7 @@ package fileexporter import ( "github.com/prometheus/client_golang/prometheus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/metrics" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/metrics" ) type FileExporter struct{ name string } diff --git a/contrib/nydusify/pkg/packer/artifact.go b/contrib/nydusify/pkg/packer/artifact.go index 6416d4cb122..53f266348ce 100644 --- a/contrib/nydusify/pkg/packer/artifact.go +++ b/contrib/nydusify/pkg/packer/artifact.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) type Artifact struct { diff --git a/contrib/nydusify/pkg/packer/backend.go b/contrib/nydusify/pkg/packer/backend.go index e5b85348c8d..05f26f3c040 100644 --- a/contrib/nydusify/pkg/packer/backend.go +++ b/contrib/nydusify/pkg/packer/backend.go @@ -11,7 +11,7 @@ package packer import ( "encoding/json" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend" ) type BackendConfig interface { diff --git a/contrib/nydusify/pkg/packer/packer.go b/contrib/nydusify/pkg/packer/packer.go index 6d2bf7d53f1..20e69d26a3b 100644 --- a/contrib/nydusify/pkg/packer/packer.go +++ b/contrib/nydusify/pkg/packer/packer.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/compactor" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/compactor" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/contrib/nydusify/pkg/packer/packer_test.go b/contrib/nydusify/pkg/packer/packer_test.go index 71c35dfb997..45b2ddcaae1 100644 --- a/contrib/nydusify/pkg/packer/packer_test.go +++ b/contrib/nydusify/pkg/packer/packer_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/build" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/build" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/contrib/nydusify/pkg/packer/pusher.go b/contrib/nydusify/pkg/packer/pusher.go index bb27e4db9b6..7f56dfa9abf 100644 --- a/contrib/nydusify/pkg/packer/pusher.go +++ b/contrib/nydusify/pkg/packer/pusher.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) type Pusher struct { diff --git a/contrib/nydusify/pkg/packer/pusher_test.go b/contrib/nydusify/pkg/packer/pusher_test.go index e3ef7655a80..394720ae7ac 100644 --- a/contrib/nydusify/pkg/packer/pusher_test.go +++ b/contrib/nydusify/pkg/packer/pusher_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/backend" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/backend" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" diff --git a/contrib/nydusify/pkg/parser/parser.go b/contrib/nydusify/pkg/parser/parser.go index d937fbdf45d..64834242d60 100644 --- a/contrib/nydusify/pkg/parser/parser.go +++ b/contrib/nydusify/pkg/parser/parser.go @@ -11,8 +11,8 @@ import ( "io" "strings" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" "github.com/containerd/containerd/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/nydusify/pkg/provider/remote.go b/contrib/nydusify/pkg/provider/remote.go index 60540f6e7a5..b1b5583acaf 100644 --- a/contrib/nydusify/pkg/provider/remote.go +++ b/contrib/nydusify/pkg/provider/remote.go @@ -18,7 +18,7 @@ import ( dockerconfig "github.com/docker/cli/cli/config" "github.com/pkg/errors" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" ) func newDefaultClient(skipTLSVerify bool) *http.Client { diff --git a/contrib/nydusify/pkg/provider/source.go b/contrib/nydusify/pkg/provider/source.go index 86d594500e3..8f54db49068 100644 --- a/contrib/nydusify/pkg/provider/source.go +++ b/contrib/nydusify/pkg/provider/source.go @@ -25,9 +25,9 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/remote" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/remote" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) // SourceLayer is a layer of source image diff --git a/contrib/nydusify/pkg/viewer/viewer.go b/contrib/nydusify/pkg/viewer/viewer.go index fcd9a82a0ec..e242f4af381 100644 --- a/contrib/nydusify/pkg/viewer/viewer.go +++ b/contrib/nydusify/pkg/viewer/viewer.go @@ -11,10 +11,10 @@ import ( "github.com/pkg/errors" "github.com/sirupsen/logrus" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/checker/tool" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/parser" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/provider" - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/utils" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/checker/tool" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/parser" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils" ) func prettyDump(obj interface{}, name string) error { diff --git a/contrib/nydusify/plugin/main.go b/contrib/nydusify/plugin/main.go index 96201ac44b9..6dc0547917f 100644 --- a/contrib/nydusify/plugin/main.go +++ b/contrib/nydusify/plugin/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/dragonflyoss/image-service/contrib/nydusify/pkg/hook" + "github.com/dragonflyoss/nydus/contrib/nydusify/pkg/hook" ) type LocalHook struct { diff --git a/smoke/go.mod b/smoke/go.mod index 3298d5119ac..c7ff674dd67 100644 --- a/smoke/go.mod +++ b/smoke/go.mod @@ -1,4 +1,4 @@ -module github.com/dragonflyoss/image-service/smoke +module github.com/dragonflyoss/nydus/smoke go 1.20 diff --git a/smoke/tests/api_test.go b/smoke/tests/api_test.go index 35f31d654dd..33cea47e81a 100644 --- a/smoke/tests/api_test.go +++ b/smoke/tests/api_test.go @@ -17,9 +17,9 @@ import ( "github.com/containerd/nydus-snapshotter/pkg/converter" "github.com/stretchr/testify/require" - "github.com/dragonflyoss/image-service/smoke/tests/texture" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/texture" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" ) type APIV1TestSuite struct{} diff --git a/smoke/tests/benchmark_test.go b/smoke/tests/benchmark_test.go index 86d102f88d2..fc7cdf67bff 100644 --- a/smoke/tests/benchmark_test.go +++ b/smoke/tests/benchmark_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/google/uuid" ) diff --git a/smoke/tests/blobcache_test.go b/smoke/tests/blobcache_test.go index 219a929c74a..5dd10a25f88 100644 --- a/smoke/tests/blobcache_test.go +++ b/smoke/tests/blobcache_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/containerd/log" - "github.com/dragonflyoss/image-service/smoke/tests/texture" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/texture" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/require" ) diff --git a/smoke/tests/compatibility_test.go b/smoke/tests/compatibility_test.go index 00ed813c5c7..c15f1588acd 100644 --- a/smoke/tests/compatibility_test.go +++ b/smoke/tests/compatibility_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/stretchr/testify/require" ) diff --git a/smoke/tests/image_test.go b/smoke/tests/image_test.go index 8d87bb86bd1..d8f06bc41ef 100644 --- a/smoke/tests/image_test.go +++ b/smoke/tests/image_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/google/uuid" ) diff --git a/smoke/tests/main_test.go b/smoke/tests/main_test.go index bedd1af585a..695bc5af9a7 100644 --- a/smoke/tests/main_test.go +++ b/smoke/tests/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/dragonflyoss/image-service/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool" ) func TestMain(m *testing.M) { diff --git a/smoke/tests/native_layer_test.go b/smoke/tests/native_layer_test.go index 2c32eee30f9..77619a4aed8 100644 --- a/smoke/tests/native_layer_test.go +++ b/smoke/tests/native_layer_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/containerd/nydus-snapshotter/pkg/converter" - "github.com/dragonflyoss/image-service/smoke/tests/texture" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/texture" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/require" ) diff --git a/smoke/tests/performance_test.go b/smoke/tests/performance_test.go index 45a66cc8b6c..06fcc9c19ec 100644 --- a/smoke/tests/performance_test.go +++ b/smoke/tests/performance_test.go @@ -9,8 +9,8 @@ import ( "os" "testing" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/google/uuid" ) diff --git a/smoke/tests/texture/layer.go b/smoke/tests/texture/layer.go index 7a5f8139dfb..c6a4933b3fe 100644 --- a/smoke/tests/texture/layer.go +++ b/smoke/tests/texture/layer.go @@ -10,7 +10,7 @@ import ( "syscall" "testing" - "github.com/dragonflyoss/image-service/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool" ) type LayerMaker func(t *testing.T, layer *tool.Layer) diff --git a/smoke/tests/tool/iterator.go b/smoke/tests/tool/iterator.go index b5bc0099770..8622643df45 100644 --- a/smoke/tests/tool/iterator.go +++ b/smoke/tests/tool/iterator.go @@ -57,7 +57,7 @@ func (d *DescartesItem) GetUInt64(name string) uint64 { // // import ( // "fmt" -// "github.com/dragonflyoss/image-service/smoke/tests/tool" +// "github.com/dragonflyoss/nydus/smoke/tests/tool" // ) // // products := tool.DescartesIterator{} diff --git a/smoke/tests/zran_layer_test.go b/smoke/tests/zran_layer_test.go index a8938f539e6..015be413ba5 100644 --- a/smoke/tests/zran_layer_test.go +++ b/smoke/tests/zran_layer_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/containerd/nydus-snapshotter/pkg/converter" - "github.com/dragonflyoss/image-service/smoke/tests/texture" - "github.com/dragonflyoss/image-service/smoke/tests/tool" - "github.com/dragonflyoss/image-service/smoke/tests/tool/test" + "github.com/dragonflyoss/nydus/smoke/tests/texture" + "github.com/dragonflyoss/nydus/smoke/tests/tool" + "github.com/dragonflyoss/nydus/smoke/tests/tool/test" "github.com/opencontainers/go-digest" "github.com/stretchr/testify/require" ) From 8c68b317ee4ca1d6fef47aedc9063b7af466b2e0 Mon Sep 17 00:00:00 2001 From: Yadong Ding Date: Fri, 15 Dec 2023 14:43:10 +0800 Subject: [PATCH 2/2] chore: modify repo to dragonflyoss/nydus Signed-off-by: Yadong Ding --- Cargo.toml | 2 +- README.md | 2 +- api/Cargo.toml | 2 +- builder/Cargo.toml | 2 +- clib/Cargo.toml | 2 +- contrib/nydus-backend-proxy/Cargo.toml | 2 +- docs/nydus-design.md | 2 +- docs/nydus-fscache.md | 4 ++-- rafs/Cargo.toml | 2 +- rafs/src/lib.rs | 2 +- service/Cargo.toml | 2 +- storage/Cargo.toml | 2 +- upgrade/Cargo.toml | 2 +- utils/Cargo.toml | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2730beff5ec..3f273da5db5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ description = "Nydus Image Service" authors = ["The Nydus Developers"] license = "Apache-2.0 OR BSD-3-Clause" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" exclude = ["contrib/", "smoke/", "tests/"] edition = "2021" resolver = "2" diff --git a/README.md b/README.md index f48aa97c8a9..2f04045371e 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ [![Release Version](https://img.shields.io/github/v/release/dragonflyoss/nydus?style=flat)](https://github.com/dragonflyoss/nydus/releases) [![License](https://img.shields.io/crates/l/nydus-rs)](https://crates.io/crates/nydus-rs) [![Twitter](https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Fdragonfly_oss)](https://twitter.com/dragonfly_oss) -[![Nydus Stars](https://img.shields.io/github/stars/dragonflyoss/image-service?label=Nydus%20Stars&style=social)](https://github.com/dragonflyoss/image-service) +[![Nydus Stars](https://img.shields.io/github/stars/dragonflyoss/nydus?label=Nydus%20Stars&style=social)](https://github.com/dragonflyoss/nydus) [![Smoke Test](https://github.com/dragonflyoss/nydus/actions/workflows/smoke.yml/badge.svg?event=schedule)](https://github.com/dragonflyoss/nydus/actions/workflows/smoke.yml?query=event%3Aschedule) [![Image Conversion](https://github.com/dragonflyoss/nydus/actions/workflows/convert.yml/badge.svg?event=schedule)](https://github.com/dragonflyoss/nydus/actions/workflows/convert.yml?query=event%3Aschedule) diff --git a/api/Cargo.toml b/api/Cargo.toml index 93d711e47eb..3bd8c03a057 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -5,7 +5,7 @@ description = "APIs for Nydus Image Service" authors = ["The Nydus Developers"] license = "Apache-2.0 OR BSD-3-Clause" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [dependencies] diff --git a/builder/Cargo.toml b/builder/Cargo.toml index d2a563a19c7..71823388990 100644 --- a/builder/Cargo.toml +++ b/builder/Cargo.toml @@ -5,7 +5,7 @@ description = "Nydus Image Builder" authors = ["The Nydus Developers"] license = "Apache-2.0" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [dependencies] diff --git a/clib/Cargo.toml b/clib/Cargo.toml index cbc3bb73718..101f6046ef2 100644 --- a/clib/Cargo.toml +++ b/clib/Cargo.toml @@ -5,7 +5,7 @@ description = "C wrapper library for Nydus SDK" authors = ["The Nydus Developers"] license = "Apache-2.0" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [lib] diff --git a/contrib/nydus-backend-proxy/Cargo.toml b/contrib/nydus-backend-proxy/Cargo.toml index 986d7d7101e..3da7f7b8104 100644 --- a/contrib/nydus-backend-proxy/Cargo.toml +++ b/contrib/nydus-backend-proxy/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" authors = ["The Nydus Developers"] description = "A simple HTTP server to provide a fake container registry for nydusd" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" license = "Apache-2.0" diff --git a/docs/nydus-design.md b/docs/nydus-design.md index 478033c9666..fe245e2d73a 100644 --- a/docs/nydus-design.md +++ b/docs/nydus-design.md @@ -2,7 +2,7 @@ # I. High Level Design ## 0. Overview -Dragonfly image service is named as `nydus`, [GitHub repo](https://github.com/dragonflyoss/image-service) +Dragonfly image service is named as `nydus`, [GitHub repo](https://github.com/dragonflyoss/nydus) Nydus consists of two parts, * a userspace filesystem called `rafs` on top of a container image format diff --git a/docs/nydus-fscache.md b/docs/nydus-fscache.md index 08dccc08d44..4e3a6252c08 100644 --- a/docs/nydus-fscache.md +++ b/docs/nydus-fscache.md @@ -83,12 +83,12 @@ sudo lsof /dev/cachefiles 1. Make sure you have installed _rust 1.52.1_ version and golang. 2. Check out the latest nydus source code with \ -``git clone https://github.com/dragonflyoss/image-service.git`` +``git clone https://github.com/dragonflyoss/nydus.git`` 3. Build nydusd and nydus-image with ``` bash -cd image-service +cd nydus make release ``` diff --git a/rafs/Cargo.toml b/rafs/Cargo.toml index bc6564ddec2..d6e3872c924 100644 --- a/rafs/Cargo.toml +++ b/rafs/Cargo.toml @@ -5,7 +5,7 @@ description = "The RAFS filesystem format for Nydus Image Service" authors = ["The Nydus Developers"] license = "Apache-2.0 OR BSD-3-Clause" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [dependencies] diff --git a/rafs/src/lib.rs b/rafs/src/lib.rs index fad578b7f6b..0ab948030ac 100644 --- a/rafs/src/lib.rs +++ b/rafs/src/lib.rs @@ -26,7 +26,7 @@ //! - [metadata](metadata/index.html): defines and accesses Rafs filesystem metadata. //! //! For more information, please refer to -//! [Dragonfly Image Service](https://github.com/dragonflyoss/image-service) +//! [Dragonfly Image Service](https://github.com/dragonflyoss/nydus) #[macro_use] extern crate log; diff --git a/service/Cargo.toml b/service/Cargo.toml index 4634751bf38..74fee2af621 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -5,7 +5,7 @@ description = "Nydus Image Service Manager" authors = ["The Nydus Developers"] license = "Apache-2.0" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" resolver = "2" diff --git a/storage/Cargo.toml b/storage/Cargo.toml index d622d49300c..44197ec108f 100644 --- a/storage/Cargo.toml +++ b/storage/Cargo.toml @@ -5,7 +5,7 @@ description = "Storage subsystem for Nydus Image Service" authors = ["The Nydus Developers"] license = "Apache-2.0 OR BSD-3-Clause" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [dependencies] diff --git a/upgrade/Cargo.toml b/upgrade/Cargo.toml index 9b13902cae5..909a2b53874 100644 --- a/upgrade/Cargo.toml +++ b/upgrade/Cargo.toml @@ -5,7 +5,7 @@ description = "Nydus Daemon Upgrade" authors = ["The Nydus Developers"] license = "Apache-2.0" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [dependencies] diff --git a/utils/Cargo.toml b/utils/Cargo.toml index cffb2b984f4..7fa381d2c68 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -5,7 +5,7 @@ description = "Utilities and helpers for Nydus Image Service" authors = ["The Nydus Developers"] license = "Apache-2.0 OR BSD-3-Clause" homepage = "https://nydus.dev/" -repository = "https://github.com/dragonflyoss/image-service" +repository = "https://github.com/dragonflyoss/nydus" edition = "2021" [dependencies]