-
Notifications
You must be signed in to change notification settings - Fork 8
fix: create correct Docker Registry V2 directory structure #184
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
WalkthroughThe Changes
Poem
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 golangci-lint (1.64.8)Error: you are using a configuration file for golangci-lint v2 with golangci-lint v1: please use golangci-lint v2 Note ⚡️ AI Code Reviews for VS Code, Cursor, WindsurfCodeRabbit now has a plugin for VS Code, Cursor and Windsurf. This brings AI code reviews directly in the code editor. Each commit is reviewed immediately, finding bugs before the PR is raised. Seamless context handoff to your AI code agent ensures that you can easily incorporate review feedback. Note ⚡️ Faster reviews with cachingCodeRabbit now supports caching for code and dependencies, helping speed up reviews. This means quicker feedback, reduced wait times, and a smoother review experience overall. Cached data is encrypted and stored securely. This feature will be automatically enabled for all accounts on May 16th. To opt out, configure 📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 90000ms (3)
✨ Finishing Touches
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
SupportNeed help? Create a ticket on our support page for assistance with any issues or questions. Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 0
🧹 Nitpick comments (1)
pkg/storage/distribution/distribution.go (1)
66-82
: Well-implemented directory structure creationThe implementation correctly creates the Docker Registry V2 directory structure before initializing the filesystem driver, which addresses the issue of
modctl ls
failing on fresh installations. Good job with:
- Creating all required directories in the proper order
- Using proper error handling with descriptive messages for each step
- Using
filepath.Join
for cross-platform path handling- Adding clear comments for each directory creation step
For improved maintainability, consider refactoring the repeated directory creation pattern using a loop:
- // Create Docker Registry V2 directory structure - dockerRegistryDir := filepath.Join(rootDir, "docker", "registry") - if err := os.MkdirAll(dockerRegistryDir, 0755); err != nil { - return nil, fmt.Errorf("failed to create docker registry directory: %w", err) - } - - // Create v2 directory - v2Dir := filepath.Join(dockerRegistryDir, "v2") - if err := os.MkdirAll(v2Dir, 0755); err != nil { - return nil, fmt.Errorf("failed to create v2 directory: %w", err) - } - - // Create repositories directory under v2 - repositoriesDir := filepath.Join(v2Dir, "repositories") - if err := os.MkdirAll(repositoriesDir, 0755); err != nil { - return nil, fmt.Errorf("failed to create repositories directory: %w", err) - } + // Create Docker Registry V2 directory structure + dirPaths := []string{ + filepath.Join(rootDir, "docker", "registry"), + filepath.Join(rootDir, "docker", "registry", "v2"), + filepath.Join(rootDir, "docker", "registry", "v2", "repositories"), + } + + dirNames := []string{"docker registry", "v2", "repositories"} + for i, path := range dirPaths { + if err := os.MkdirAll(path, 0755); err != nil { + return nil, fmt.Errorf("failed to create %s directory: %w", dirNames[i], err) + } + }This maintains the same functionality while reducing code duplication.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
Cache: Disabled due to data retention organization setting
Knowledge Base: Disabled due to data retention organization setting
📒 Files selected for processing (1)
pkg/storage/distribution/distribution.go
(2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (3)
- GitHub Check: Test
- GitHub Check: Lint
- GitHub Check: Analyze (go)
🔇 Additional comments (1)
pkg/storage/distribution/distribution.go (1)
24-25
: Appropriate import additionsThe imports for "os" and "path/filepath" are correctly added to support directory creation operations.
Signed-off-by: mengxiancheng <[email protected]>
7ca2577
to
16c4fbc
Compare
Is the permission(0755 in code) same as if the directory generated by distribution automatically when build the first model artifact? |
Fix directory structure issue when running
modctl ls
for the first time.Problem Description:
modctl ls
command fails immediately after installing modctl due to missing Docker Registry V2 directory structure/docker/registry/v2/repositories
directory cannot be foundSolution:
NewStorage
functionTesting:
modctl ls
command works correctly on first run after installation~/.modctl/content.v1/docker/registry/v2/repositories
Summary by CodeRabbit